other fixes for windows