Minor enhancements.

On branch master