More win32 fixes