Make integer comparisons work again