Fixed issues with versioning