Birth death updates

A few more fixes *around* this story https://www.pivotaltracker.com/story/show/57386938