fixes for new versioning: