Fixed the two bugs found at merge
Versioning