More stuff from pull request comments