Minor fixes to death utils