Fixes to comparators.