Some more fixes for windows build.