ScoreBoard Fixes