Fix comparisons