fixes to respawn