Few win32 fixes