Minor changes to respawn