fixes for Windows build.