Scoreboard fixes.