Pre-review fixes