Scoreboard 'fixes' #2