Fixes for Windows build.