Fixes to provisioning script to work around problems with Windows install