Fixes resulting from pull request review