More fixes to make the new ransac work (still doesn't compile)