Initial post-review fixes