Win32 compatibility changes