Add minor changes.
Add a few minor changes.