Scores options fixes