Little fixes, comparator tweaks