Spectator Mode Fixes