More versioning fixes