win32 more build fixes