Fix kill stuff