Minor changes for new windows install