Fix DeathMessagesListener for code merge