diff --git a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java
index 2176dfdaf4a..d8445c7b737 100644
--- a/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java
+++ b/sql/jdbc-proto/src/main/java/org/elasticsearch/xpack/sql/jdbc/net/protocol/Proto.java
@@ -36,7 +36,7 @@ public final class Proto extends AbstractProto {
         META_COLUMN(MetaColumnRequest::new),
         QUERY_INIT(QueryInitRequest::new),
         QUERY_PAGE(QueryPageRequest::new),
-//        QUERY_CLOSE(QueryClosenRequest::new), NOCOMMIT implement me
+        //        QUERY_CLOSE(QueryClosenRequest::new), TODO implement me
         ;
 
         private final RequestReader reader;
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/RowSet.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/RowSet.java
index ff74d28d266..38a22ff73f1 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/RowSet.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/session/RowSet.java
@@ -5,10 +5,6 @@
  */
 package org.elasticsearch.xpack.sql.session;
 
-import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.xpack.sql.type.Schema;
-import org.elasticsearch.xpack.sql.execution.PlanExecutor;
-
 import java.util.function.Consumer;
 
 /**
@@ -27,7 +23,7 @@ public interface RowSet extends RowView {
     void reset();
 
     /**
-     * The key used by {@link PlanExecutor#nextPage(Cursor, ActionListener)} to fetch the next page.
+     * The key used by PlanExecutor#nextPage to fetch the next page.
      */
     Cursor nextPageCursor();
 
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/ReflectionUtils.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/ReflectionUtils.java
index c30852ef328..51a2a4d45d8 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/ReflectionUtils.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/util/ReflectionUtils.java
@@ -22,7 +22,7 @@ public class ReflectionUtils {
         }
         if (t instanceof ParameterizedType) {
             Type[] typeArguments = ((ParameterizedType) t).getActualTypeArguments();
-            if (typeArguments.length == 1) {
+            if (typeArguments.length != 1) {
                 throw new SqlIllegalArgumentException("Unexpected number of type arguments %s for %s", Arrays.toString(typeArguments), t);
             }
 
@@ -35,7 +35,7 @@ public class ReflectionUtils {
             }
             Type[] upperBounds = wt.getUpperBounds();
 
-            if (upperBounds.length == 1) {
+            if (upperBounds.length != 1) {
                 throw new SqlIllegalArgumentException("Unexpected number of upper bounds %s for %s", Arrays.toString(upperBounds), t);
             }
 
@@ -54,7 +54,7 @@ public class ReflectionUtils {
         for (Type type = clazz.getGenericSuperclass(); clazz != Object.class; type = clazz.getGenericSuperclass()) {
             if (type instanceof ParameterizedType) {
                 Type[] typeArguments = ((ParameterizedType) type).getActualTypeArguments();
-                if (typeArguments.length == 2 || typeArguments.length == 1) {
+                if (typeArguments.length != 2 && typeArguments.length != 1) {
                     throw new SqlIllegalArgumentException("Unexpected number of type arguments %s for %s", Arrays.toString(typeArguments),
                             c);
                 }