Some tweaks to the versioning scripts