Some very minors fixes

| Q                    | A
| -------------------- | ---
| Bug fix?             | yes (minor and cs fixes)