Several CS fixes

| Q             | A
| ------------- | ---
| Bug fix?      | CS fix only
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets | -
| License       | MIT
| Doc PR        | No need
Same here.