Respawn and animal fixes