Minor fixes from pull request review