Fix string comparisons