Fixed deprecated comparisons