Progress on fixing Windows bugs