Final post-review changes