Fixed up comparisons and such