Fix Win32 issues