fixes for windows