Several minor fixes

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | ---
| Fixed tickets | ---
| Refs tickets  | #1725, https://github.com/zikula/core/commit/7320b6f51921a6ffe50c22edc59cf9d563b082b8
| License       | MIT
| Doc PR        | ---