Minor changes

Trying to separate out incremental improvements from other changes.