Some textual fixes
Merge pull request #15700 from Jille/textual-fixes

Some textual fixes