More tweaking to the versioning