diff --git a/groundtest b/groundtest
index 4ecc9ec3..a7c8c203 160000
--- a/groundtest
+++ b/groundtest
@@ -1 +1 @@
-Subproject commit 4ecc9ec310bddb6841f71c7c2887e5c4bec1a297
+Subproject commit a7c8c20300c1218b9d8f56c6f3d62f46b0359648
diff --git a/junctions b/junctions
index 4c04c27d..46db745f 160000
--- a/junctions
+++ b/junctions
@@ -1 +1 @@
-Subproject commit 4c04c27df802ae94c7a54ac24ab792dac9651b99
+Subproject commit 46db745fe3806733257a16766dd97a281810c6d5
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 06168752..818a9e26 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -8,6 +8,7 @@ import uncore.tilelink._
 import uncore.coherence._
 import uncore.agents._
 import uncore.devices._
+import uncore.converters._
 import rocket._
 import rocket.Util._
 import groundtest._
@@ -307,6 +308,7 @@ 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 8d28d89b..2109a48e 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit 8d28d89b18b24cf3b354fab8fc5173344bc546f7
+Subproject commit 2109a48e18719383942d535ff4c1d0a859dcc424