Minor text fixes

(This is a subset of the changes in #403.)