Various fixes related to versioning