Scoreboard fixes #2