Fixes with ScoreView