win32 build fixes, including ingo's suggestions