fixes for windows!