Final changes to meet versioning requirements.