fixes for windows support