Fix a few references.
Merge changes.