Improving Win32 compatibility