Fix issues with zombies