Fixes based on pull request feedback