diff --git a/build.sbt b/build.sbt
index fc144862..bbbb8251 100644
--- a/build.sbt
+++ b/build.sbt
@@ -152,7 +152,6 @@ lazy val chipyard = (project in file("generators/chipyard"))
 lazy val fft_generator = (project in file("generators/fft-generator"))
   .dependsOn(rocketchip, `rocket-dsp-utils`)
   .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselSettings)
   .settings(commonSettings)
 
 lazy val tracegen = (project in file("generators/tracegen"))
@@ -222,8 +221,9 @@ lazy val tapeout = (project in file("./tools/barstools/"))
   .settings(commonSettings)
 
 lazy val dsptools = freshProject("dsptools", file("./tools/dsptools"))
-  .settings(chiselTestSettings)
   .settings(
+    chiselSettings,
+    chiselTestSettings,
     commonSettings,
     libraryDependencies ++= Seq(
       "org.scalatest" %% "scalatest" % "3.2.+" % "test",
diff --git a/generators/fft-generator b/generators/fft-generator
index b9f1c085..511e33f9 160000
--- a/generators/fft-generator
+++ b/generators/fft-generator
@@ -1 +1 @@
-Subproject commit b9f1c085afa25e1688d5acbd3f252882d511b90e
+Subproject commit 511e33f933e83020f3f7b535641da0b46ceb6923