Text fixes

This pull request collects the fixes discussed in #803.

**Do not merge yet.**