A few additional tweaks based on pull request feedback