Windows build fixes.