Fix uber mode & last pair selection