Scoreboard fixes