Windows fixes.
Merge topic 'minor-cleanups' into next

05ce2a9 Windows fixes.