String comparison fixes