diff --git a/build.sbt b/build.sbt
index 1132dde1..b50bc200 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,8 @@
 import Tests._
 
+// Ignore linting for traceLevel
+Global / excludeLintKeys += traceLevel
+
 // This gives us a nicer handle to the root project instead of using the
 // implicit one
 lazy val chipyardRoot = Project("chipyardRoot", file("."))
diff --git a/generators/hwacha b/generators/hwacha
index b67d8ed0..27e03b7e 160000
--- a/generators/hwacha
+++ b/generators/hwacha
@@ -1 +1 @@
-Subproject commit b67d8ed06172c2ecd76807d3ef2bd5c79903f182
+Subproject commit 27e03b7e2694b4389c64c92a3518b1dba5304905
diff --git a/sims/firesim b/sims/firesim
index f9ca2f49..515ac120 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit f9ca2f49f95e2b51cf0e966ac13b1f285db341cf
+Subproject commit 515ac12059a347f34b13833888ace941a9629be5