Minor changes

Revised PR. No semantic change.