Minor changes.
Merge completed.