Fixes per the pull request comments