hot fix and support versioning fixes