More Win32 build fixes