Minor changes.
Merged.