diff --git a/rocket b/rocket
index 4d29d5c4..3c3e35a5 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 4d29d5c48cfaa3800bf5b6d5428a9c6e83335477
+Subproject commit 3c3e35a56e954b35e6ceb17179ebadc52e8d9b3f
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index d7ed791d..c80230f5 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -139,7 +139,7 @@ class DefaultConfig extends ChiselConfig (
           maxClientsPerPort = if(site(BuildRoCC).isEmpty) 1 else 3,
           maxManagerXacts = site(NAcquireTransactors) + 2,
           addrBits = site(PAddrBits) - site(CacheBlockOffsetBits),
-          dataBits = site(CacheBlockBytes)*8)()
+          dataBits = site(CacheBlockBytes)*8)
       case TLKey("L2toMC") => 
         TileLinkParameters(
           coherencePolicy = new MEICoherence(new NullRepresentation(site(NBanksPerMemoryChannel))),
@@ -150,19 +150,8 @@ class DefaultConfig extends ChiselConfig (
           maxClientsPerPort = site(NAcquireTransactors) + 2,
           maxManagerXacts = 1,
           addrBits = site(PAddrBits) - site(CacheBlockOffsetBits),
-          dataBits = site(CacheBlockBytes)*8)()
-      case TLKey("Outermost") =>
-        TileLinkParameters(
-          coherencePolicy = new MEICoherence(new NullRepresentation(site(NBanksPerMemoryChannel))),
-          nManagers = 1,
-          nCachingClients = site(NBanksPerMemoryChannel),
-          nCachelessClients = 0,
-          maxClientXacts = 1,
-          maxClientsPerPort = site(NAcquireTransactors) + 2,
-          maxManagerXacts = 1,
-          addrBits = site(PAddrBits) - site(CacheBlockOffsetBits),
-          dataBits = site(CacheBlockBytes)*8,
-          dataBeats = site(MIFDataBeats))()
+          dataBits = site(CacheBlockBytes)*8)
+      case TLKey("Outermost") => site(TLKey("L2toMC")).copy(dataBeats = site(MIFDataBeats))
       case NTiles => Knob("NTILES")
       case NMemoryChannels => 1
       case NBanksPerMemoryChannel => Knob("NBANKS")
diff --git a/uncore b/uncore
index aa40f7d7..b2d20a81 160000
--- a/uncore
+++ b/uncore
@@ -1 +1 @@
-Subproject commit aa40f7d7c11b5dd099376baf73b998da859a1616
+Subproject commit b2d20a8166fe3121f35298adcab2594eda642be6
diff --git a/zscale b/zscale
index 3338af40..599fc064 160000
--- a/zscale
+++ b/zscale
@@ -1 +1 @@
-Subproject commit 3338af40491ccfe4b403761d755372c201003e39
+Subproject commit 599fc0644351a28759f351c4be7068e5cbb7b092