Fix some more Win32 builds.