Fix death messages to work as intended