More fixes for windows.