Fix build error from Pair changes