Fixes based on pull request review.