Tweaks to death event handler