Fixed some versioning issues