diff --git a/junctions b/junctions
index 46db745f..027f3d7f 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit 46db745fe3806733257a16766dd97a281810c6d5
+Subproject commit 027f3d7fa6bf0da5af899e51a7010921ecb9dff0
diff --git a/rocket b/rocket
index d972677a..5c87faad 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit d972677a0c07b6cdf6b806cbd4a152b103c3293c
+Subproject commit 5c87faad33ab949af5d8daaa3b3439ceecfd7b83
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index dec14179..ed7e4297 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -308,7 +308,6 @@ class BaseConfig extends Config (
       case ConfigString => makeConfigString()
       case GlobalAddrMap => globalAddrMap
       case EnableL2Logging => false
-      case NastiResponseBufferDepth => site(MIFDataBeats) * site(NAcquireTransactors)
       case _ => throw new CDEMatchError
   }},
   knobValues = {
diff --git a/uncore b/uncore
index bc6679ec..73ef0649 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit bc6679ecd5edfe8dbfa27e52d06651f7b8ae47dc
+Subproject commit 73ef0649f34a2aa3e535ce1eefbb3b81b8c21768