Scoreboard improvements