Fix client crash
Fix some of the spectator issues