Scoring fixes