More respawn fixes