A few little fixes
Fix bug with versioning