More cosmetic fixes
Versioning