merge a few Win32 build fixes