More code-review fixes