Various fixes

| Q                    | A
| -------------------- | ---
| Bug fix?             | yes
| New feature?         | yes
| BC breaks?           | no
| CI currently passes? | yes
| Tests pass?          | yes
| Scenarios pass?      | yes
| Checkstyle issues?   | no
| Changelog updated?   | yes
| Fixed tickets        |
| Doc PR               |