Some adjustments for adaptive scoring
Work-around or gmail/adaptive scoring bug