diff --git a/rocket b/rocket
index 3dda614e..7be550b4 160000
--- a/rocket
+++ b/rocket
@@ -1 +1 @@
-Subproject commit 3dda614ea9883499ab38767d11d091c520e14af3
+Subproject commit 7be550b4f6cbf73514019712fd8505e7106e4f39
diff --git a/src/main/scala/Configs.scala b/src/main/scala/Configs.scala
index 7ec65a36..27d137d4 100644
--- a/src/main/scala/Configs.scala
+++ b/src/main/scala/Configs.scala
@@ -276,6 +276,7 @@ class DefaultL2FPGAConfig extends Config(new WithL2Capacity64 ++ new WithL2Cache
 
 class WithZscale extends Config(
   (pname,site,here) => pname match {
+    case XLen => 32
     case BuildZscale => {
       TestGeneration.addSuites(List(rv32ui("p"), rv32um("p")))
       TestGeneration.addSuites(List(zscaleBmarks))
diff --git a/zscale b/zscale
index b79c35bb..ccf9bd37 160000
--- a/zscale
+++ b/zscale
@@ -1 +1 @@
-Subproject commit b79c35bb316a857c0d5ce341b4f0e3317a4e512a
+Subproject commit ccf9bd37268d6c0237a426e40175d05a3b890802