Fixups from pull request feedback