diff --git a/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala b/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala
index 5e5bbed2942..fb60f15db4d 100644
--- a/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala
+++ b/sql-plugin/src/main/spark330db/scala/com/nvidia/spark/rapids/shims/Spark321PlusDBShims.scala
@@ -41,8 +41,8 @@ import org.apache.spark.sql.execution.exchange._
 import org.apache.spark.sql.execution.python._
 import org.apache.spark.sql.execution.window._
 import org.apache.spark.sql.rapids.GpuSubstring
-import org.apache.spark.sql.rapids.execution._
-import org.apache.spark.sql.rapids.execution.shims.{GpuSubqueryBroadcastMeta,ReuseGpuBroadcastExchangeAndSubquery}
+import org.apache.spark.sql.rapids.execution.GpuSubqueryBroadcastMeta
+import org.apache.spark.sql.rapids.execution.shims.ReuseGpuBroadcastExchangeAndSubquery
 import org.apache.spark.sql.rapids.shims._
 import org.apache.spark.sql.types._
 
diff --git a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala
similarity index 96%
rename from sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala
rename to sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala
index fbc013779c4..76255b3e5a6 100644
--- a/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/shims/GpuSubqueryBroadcastMeta.scala
+++ b/sql-plugin/src/main/spark330db/scala/org/apache/spark/rapids/execution/GpuSubqueryBroadcastMeta.scala
@@ -19,7 +19,7 @@
 {"spark": "332db"}
 {"spark": "341db"}
 spark-rapids-shim-json-lines ***/
-package org.apache.spark.sql.rapids.execution.shims
+package org.apache.spark.sql.rapids.execution
 
 import com.nvidia.spark.rapids.{BaseExprMeta, DataFromReplacementRule, GpuExec, RapidsConf, RapidsMeta, SparkPlanMeta}
 
@@ -29,7 +29,6 @@ import org.apache.spark.sql.execution.{SparkPlan, SubqueryBroadcastExec}
 import org.apache.spark.sql.execution.adaptive.{BroadcastQueryStageExec}
 import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec, ReusedExchangeExec}
 import org.apache.spark.sql.execution.joins.HashedRelationBroadcastMode
-import org.apache.spark.sql.rapids.execution._
 
 class GpuSubqueryBroadcastMeta(
     s: SubqueryBroadcastExec,
@@ -94,7 +93,7 @@ class GpuSubqueryBroadcastMeta(
   override def convertToCpu(): SparkPlan = s
 
   override def convertToGpu(): GpuExec = {
-    GpuSubqueryBroadcastExec(s.name, s.index, s.buildKeys, broadcastBuilder())(
+    GpuSubqueryBroadcastExec(s.name, Seq(s.index), s.buildKeys, broadcastBuilder())(
       getBroadcastModeKeyExprs)
   }
 
@@ -123,4 +122,4 @@ class GpuSubqueryBroadcastMeta(
       case m => throw new UnsupportedOperationException(s"Unknown broadcast mode $m")
     }
   }
-}
\ No newline at end of file
+}