Some more adjustments on adopting comparators