Another collection of fixes: Typos, logic, formatting etc.

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | -
| Applies to    | 2.2+
| Fixed tickets | -

Another summary of some minor issues in this PR. 

Please comment if something is wrong - I'll do an update then.