Scoreboard fixes #1