Improve comparisons