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

0468cb7 Windows build fixes.