Cloning and deathsquad fixes