Fix improper string comparisons