post-review fixes