some fixes for Versioning