Language nits
Merge pull request #1095 from zeha/lang-nits

Language nits