Cosmetic fixes

Copy changes from these tickets:

1. https://www.pivotaltracker.com/story/show/74844320
2. https://www.pivotaltracker.com/story/show/74844674
3. https://www.pivotaltracker.com/story/show/74844898