Versioning fixes 2