Slight improvements to our Windows batch files [ci skip].