Fixed some mentor-kid pairing issues