Small changes based on pull request feedback.