diff --git a/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/cli/CliIntegrationTestCase.java b/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/cli/CliIntegrationTestCase.java
index 63ea2f31352..f4024d64673 100644
--- a/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/cli/CliIntegrationTestCase.java
+++ b/qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/cli/CliIntegrationTestCase.java
@@ -52,9 +52,10 @@ public abstract class CliIntegrationTestCase extends ESRestTestCase {
     static {
         String addressAndPort = System.getProperty("tests.cli.fixture");
         if (addressAndPort == null) {
-            throw new IllegalArgumentException("Must set the [tests.cli.fixture] property. This is required even in embedded "
-                    + "mode. The easiest way to run the fixture is with "
-                    + "`gradle :x-pack-elasticsearch:test:sql-cli-fixture:run` and to set the property to localhost:53798");
+            throw new IllegalArgumentException("Must set the [tests.cli.fixture] property. Gradle handles this for you "
+                    + " in regular tests. In embedded mode the easiest thing to do is run "
+                    + "`gradle :x-pack-elasticsearch:qa:sql:no-security:run` and to set the property to the contents of "
+                    + "`qa/sql/no-security/build/fixtures/cliFixture/ports`");
         }
         int split = addressAndPort.lastIndexOf(':');
         try {
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeFunction.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeFunction.java
index 8f1ea161eee..0bd2161e079 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeFunction.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeFunction.java
@@ -59,7 +59,7 @@ public abstract class DateTimeFunction extends UnaryScalarFunction implements Ti
 
     @Override
     protected ScriptTemplate asScriptFrom(FieldAttribute field) {
-        // NOCOMMIT I think we should investigate registering SQL as a script engine so we don't need to generate painless
+        // TODO I think we should investigate registering SQL as a script engine so we don't need to generate painless
         return new ScriptTemplate(createTemplate(), 
                 paramsBuilder()
                     .variable(field.name())
@@ -76,7 +76,7 @@ public abstract class DateTimeFunction extends UnaryScalarFunction implements Ti
         if (DateTimeZone.UTC.equals(timeZone)) {
             return formatTemplate("doc[{}].value.get" + extractFunction() + "()");
         } else {
-            // NOCOMMIT ewwww
+            // TODO ewwww
             /* This uses the Java 8 time API because Painless doesn't whitelist creation of new
              * Joda classes. */
 
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/AbstractSqlServer.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/AbstractSqlServer.java
index aaa4699d695..684dcac7615 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/AbstractSqlServer.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/AbstractSqlServer.java
@@ -37,7 +37,7 @@ public abstract class AbstractSqlServer {
     }
 
     protected final Response exceptionResponse(Request req, Exception e) {
-        // NOCOMMIT I wonder why we don't just teach the servers to handle ES's normal exception response.....
+        // NOCOMMIT I wonder why we don't just teach the clients to handle ES's normal exception response.....
         SqlExceptionType exceptionType = sqlExceptionType(e);
 
         String message = EMPTY;
diff --git a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
index bbea5907f80..373a9cdb17e 100644
--- a/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
+++ b/sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/sql/action/SqlResponse.java
@@ -166,7 +166,6 @@ public class SqlResponse extends ActionResponse implements ToXContentObject {
      * Information about a column.
      */
     public static final class ColumnInfo implements Writeable, ToXContentObject {
-        // NOCOMMIT: we probably need to add more info about columns, but that's all we use for now
         private final String name;
         private final String type;