Fixed versioning issues