Fixes from upgrade
Versioning