Fix messaging on kill