Merge "Extra Win32 compatibility."