Fix comparator requirements for builder