Final win32 related fixes