More tweaks from pull request