diff --git a/build.sc b/build.sc
index ab0240f1c17..bce888a8d5c 100644
--- a/build.sc
+++ b/build.sc
@@ -49,7 +49,16 @@ object v extends Module {
     scalaCrossVersions.flatMap { ver =>
       Seq(chisel(ver), stdlib(ver), unipublish)
     } ++ scalaCrossVersions.filterNot(isScala3(_)).flatMap { ver2 =>
-      Seq(chisel(ver2).test, firrtl(ver2).test, svsim(ver2).test, integrationTests(ver2).test, litutility(ver2), panamaconverter(ver2), panamalib(ver2), panamaom(ver2))
+      Seq(
+        chisel(ver2).test,
+        firrtl(ver2).test,
+        svsim(ver2).test,
+        integrationTests(ver2).test,
+        litutility(ver2),
+        panamaconverter(ver2),
+        panamalib(ver2),
+        panamaom(ver2)
+      )
     }
   }
 
diff --git a/core/src/main/scala/chisel3/BitsImpl.scala b/core/src/main/scala/chisel3/BitsImpl.scala
index 98c5f2b6f42..f28dcc3ce34 100644
--- a/core/src/main/scala/chisel3/BitsImpl.scala
+++ b/core/src/main/scala/chisel3/BitsImpl.scala
@@ -99,7 +99,7 @@ private[chisel3] trait BitsImpl extends Element { self: Bits =>
   }
 
   protected def _applyImpl(x: UInt)(implicit sourceInfo: SourceInfo): Bool =
-    extract(x)
+    _extractImpl(x)
 
   protected def _applyImpl(x: Int, y: Int)(implicit sourceInfo: SourceInfo): UInt = {
     if ((x < y && !(x == -1 && y == 0)) || y < 0) {
diff --git a/core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala b/core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala
index b4aea3029a2..f8107ecf117 100644
--- a/core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala
+++ b/core/src/main/scala/chisel3/experimental/hierarchy/InstantiateImpl.scala
@@ -92,7 +92,7 @@ private[chisel3] trait InstantiateImpl {
     val modulePrefix = Module.currentModulePrefix
     Builder.contextCache
       .getOrElseUpdate(
-        CacheKey[A](boxAllData(args), tt, Seq(modulePrefix).toList), {
+        CacheKey[A](boxAllData(args), tt, List(modulePrefix)), {
           // The definition needs to have no source locator because otherwise it will be unstably
           // derived from the first invocation of Instantiate for the particular Module
           Definition.apply(f(args))(UnlocatableSourceInfo)