Minor changes.
Merged some changes.