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