Changes from pull request comments