Updates based on PR comments
- #10
- https://www.pivotaltracker.com/story/show/67751518
[Fixes #67751518]