windows build fixes.