Post-review fixes #2 (#4)