Widnows build fixes.