Added better support for respawning.