More Scoreboard Fixes