Fixes to the scoreboard