Small pre-review fixes