Fixes to Windows build.