Final respawn fixes

Should be perfectly fine but needs testing