Spectator mode, fixes