Fixes to comparisons.