Minor changes.
Merged