Some changes to help the pairings.