fixed various inconsistencies
minor #10243 Various minor changes (for 2.4) (fabpot)

This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #10243).

Discussion
----------

Various minor changes (for 2.4)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

19f79c3 fixed various inconsistencies