Pairings fixes