More win32 fixing