Various Versioning Bugfixes