More fixes for win