Fixes based on review of the pull request