Versioning cleanup
Distribution bugfix