Fixes based on code review by @sethvargo