Some minor tweaks to the windows script