Minor changes to PositionScorer