More tweaks on Windows.