Windows fixes

Casualties of the recent clean-up
Merge branch 'master' into clean_transparent