diff --git a/build.xml b/build.xml
index 8930e9049..8aae47ce9 100644
--- a/build.xml
+++ b/build.xml
@@ -3,8 +3,8 @@
     xmlns:if="ant:if"
     xmlns:jacoco="antlib:org.jacoco.ant">
     
-    <property name="jvmci.version" value="jvmci-20-b04" />
-    <property name="jdk8.version"  value="212" />
+    <property name="jvmci.version" value="jvmci-19.2-b02" />
+    <property name="jdk8.version"  value="222" />
 
     <macrodef name="travis">
         <attribute name="target" />
diff --git a/libs/black-diamonds b/libs/black-diamonds
index 5faf5c7db..9a0bfc712 160000
--- a/libs/black-diamonds
+++ b/libs/black-diamonds
@@ -1 +1 @@
-Subproject commit 5faf5c7db8b3cf5d0d427dd530f8e5be2c9d6a3c
+Subproject commit 9a0bfc712e385d7f92ce23f397d59557a0cbef18
diff --git a/libs/mx b/libs/mx
index a0184e84d..081fec1c7 160000
--- a/libs/mx
+++ b/libs/mx
@@ -1 +1 @@
-Subproject commit a0184e84d38e3ce6301e0553a545066bcbfc4dd8
+Subproject commit 081fec1c7eb9b518d1b1fe8ce52665726ccdd7a8
diff --git a/libs/truffle b/libs/truffle
index efc4e8796..ae9b41f33 160000
--- a/libs/truffle
+++ b/libs/truffle
@@ -1 +1 @@
-Subproject commit efc4e8796cce52b5472ff341ec1115bb488d94f4
+Subproject commit ae9b41f33f5f98caf5e596e994532fd12de38495
diff --git a/src/som/interpreter/Invokable.java b/src/som/interpreter/Invokable.java
index 021141209..42a2e5f19 100644
--- a/src/som/interpreter/Invokable.java
+++ b/src/som/interpreter/Invokable.java
@@ -35,6 +35,7 @@ public Invokable(final String name,
     this.uninitializedBody = uninitialized;
     this.isAtomic = isAtomic;
     this.sourceSection = sourceSection;
+    expressionOrSequence.markAsRootExpression();
   }
 
   @Override
diff --git a/src/som/interpreter/Method.java b/src/som/interpreter/Method.java
index fcc5bed2f..cf9b5cf0d 100644
--- a/src/som/interpreter/Method.java
+++ b/src/som/interpreter/Method.java
@@ -54,7 +54,6 @@ public Method(final String name, final SourceSection sourceSection,
     this.block = block;
     this.methodScope = methodScope;
     assert methodScope.isFinalized();
-    expressions.markAsRootExpression();
   }
 
   @Override