minor fixes for windows