A few more string comparisons to fix