Some (more) last minute Windows fixes.