Comparator tweaks