Updates based on PR comments

- #3
- https://www.pivotaltracker.com/story/show/67751318
[Fixes #67751318]