Fixing bugs reported on June 10 Windows