Fix 2 bugs in scoreboard class selection.