more fixes for windows