Fixups for Win32 build.