Fix String comparisons with "==" -> .equals