Windows fixes

Casualties of the recent clean-up