More Windows build fixes.