More tweaks and typo corrections to jenkins_build for windows