Fixing references.
Merge from upstream