rest of changes for 4.10.0 Windows installation