Minor wording fixes

[merge]