some more fixes for win2