diff --git a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
index c821d061a5e..68d3db9a36d 100644
--- a/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
+++ b/processing/src/main/java/org/apache/druid/query/FrameBasedInlineDataSource.java
@@ -103,7 +103,7 @@ public class FrameBasedInlineDataSource implements DataSource
               .collect(Collectors.toList());
 
           return Sequences.simple(
-              () -> new Iterator<>()
+              () -> new Iterator<Object[]>()
               {
                 @Override
                 public boolean hasNext()
diff --git a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
index 3ed5d5938bf..ed602678a82 100644
--- a/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
+++ b/server/src/test/java/org/apache/druid/server/QuerySchedulerTest.java
@@ -666,7 +666,7 @@ public class QuerySchedulerTest
   {
     return new LazySequence<>(() -> {
       return new BaseSequence<>(
-          new BaseSequence.IteratorMaker<>()
+          new BaseSequence.IteratorMaker<Integer, Iterator<Integer>>()
           {
             @Override
             public Iterator<Integer> make()
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRelFieldTrimmer.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRelFieldTrimmer.java
index 9a3673c6256..2d6a05687af 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRelFieldTrimmer.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidRelFieldTrimmer.java
@@ -99,6 +99,9 @@ public class DruidRelFieldTrimmer extends RelFieldTrimmer
     return result(input, mapping);
   }
 
+  /**
+   * Should be unnecesarry in versions having CALCITE-6715
+   */
   public TrimResult trimFields(LogicalCorrelate correlate,
       ImmutableBitSet fieldsUsed,
       Set<RelDataTypeField> extraFields)