Improve Win32 compatibility.