minor fixes for windows build