Scoreboard Fixes