More fixes for windows build.