Slight improvements to our Batch files [ci skip].