Minor final changes.