More fixes for windows