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