Versioning tweaks