Fixes for https://www.pivotaltracker.com/s/projects/838407/stories/61106624