More grammatical fixes to tools #6339