Fixing all the versioning for branches