Code-review fixes