Updates based on PR comments

- #11
- https://www.pivotaltracker.com/story/show/67918076
[Fixes #67918076]