Fixes to Win32 build.