Minor scoreboard fixes.