diff --git a/build.sbt b/build.sbt
index b24fa748..e984de86 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,7 +13,7 @@ lazy val commonSettings = Seq(
     case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
     case _ => MergeStrategy.first}},
   scalacOptions ++= Seq("-deprecation","-unchecked","-Xsource:2.11"),
-  addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
+  addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full),
   unmanagedBase := (chipyardRoot / unmanagedBase).value,
   allDependencies := {
     // drop dependencies (org, name)
diff --git a/common.mk b/common.mk
index 33c0137c..24ab5687 100644
--- a/common.mk
+++ b/common.mk
@@ -237,7 +237,6 @@ launch-sbt:
 .PHONY: shutdown-sbt-server
 shutdown-sbt-server:
 	cd $(base_dir) && $(SBT) "shutdown"
-	rm -rf $(SBT_THIN_CLIENT_TIMESTAMP)
 
 .PHONY: start-sbt-server
 start-sbt-server:
diff --git a/sims/firesim b/sims/firesim
index e43828a1..52a9d0fd 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit e43828a1fc9608123ae94abc40dfe813ccf23860
+Subproject commit 52a9d0fd2fd3f4ef32337ebd07e36e7ec16d906a
diff --git a/tools/barstools b/tools/barstools
index 15fa68b3..62f31165 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit 15fa68b3a40addc5ac77a78ced37497dbce3f687
+Subproject commit 62f311654a4b31ccbc2839beaee64cd770ecd4a0