Fix some pair stuff