Fixes on behalf of https://www.pivotaltracker.com/story/show/68865816