Fix death bugs