diff --git a/build.sbt b/build.sbt
index f9b821856f..3366747f77 100644
--- a/build.sbt
+++ b/build.sbt
@@ -57,21 +57,20 @@ val baseScalacOptions = Seq(
 // https://www.scala-lang.org/2021/01/12/configuring-and-suppressing-warnings.html
 // cat={warning-name}:ws prints a summary with the number of warnings of the given type
 // any:e turns all remaining warnings into errors
-val fatalWarnings = Seq(
-  if (sys.env.get("MANTIS_FULL_WARNS").contains("true")) {
-    "-Wconf:any:w"
-  }
-  else {
-    "-Wconf:" ++ Seq(
-      // Let's turn those gradually into errors:
-      "cat=deprecation:ws",
-      "cat=lint-package-object-classes:ws",
-      "cat=unused:ws",
-      "cat=lint-infer-any:ws",
-      "cat=lint-byname-implicit:ws",
-      "cat=other-match-analysis:ws",
-      "any:e").mkString(",")
-  }) ++ Seq("-Ypatmat-exhaust-depth", "off")
+val fatalWarnings = Seq(if (sys.env.get("MANTIS_FULL_WARNS").contains("true")) {
+  "-Wconf:any:w"
+} else {
+  "-Wconf:" ++ Seq(
+    // Let's turn those gradually into errors:
+    "cat=deprecation:ws",
+    "cat=lint-package-object-classes:ws",
+    "cat=unused:ws",
+    "cat=lint-infer-any:ws",
+    "cat=lint-byname-implicit:ws",
+    "cat=other-match-analysis:ws",
+    "any:e"
+  ).mkString(",")
+}) ++ Seq("-Ypatmat-exhaust-depth", "off")
 
 def commonSettings(projectName: String): Seq[sbt.Def.Setting[_]] = Seq(
   name := projectName,
diff --git a/nix/overlay.nix b/nix/overlay.nix
index ad4173cf4e..c8949f6c37 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -14,7 +14,7 @@ rev: final: prev: {
   # ourselves instead.
   mantis-extvm-pb = builtins.fetchGit {
     url = "https://github.com/input-output-hk/mantis-extvm-pb";
-    rev = "53eb31f3c59f7200994915b834e626bd292df7ed";
+    rev = "8f52caba70afc95ce669e9d61f773468db54557e";
   };
 
   writeBashChecked = final.writers.makeScriptWriter {
diff --git a/src/main/protobuf/extvm b/src/main/protobuf/extvm
index aa7d74daa3..8f52caba70 160000
--- a/src/main/protobuf/extvm
+++ b/src/main/protobuf/extvm
@@ -1 +1 @@
-Subproject commit aa7d74daa3f08ed059fdd8a2a6950b2ec575c24e
+Subproject commit 8f52caba70afc95ce669e9d61f773468db54557e