diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java
index aa36f857..012361c5 100644
--- a/src/main/java/carpet/script/CarpetExpression.java
+++ b/src/main/java/carpet/script/CarpetExpression.java
@@ -972,7 +972,7 @@ public class CarpetExpression
                 return (c_, t_) -> Value.FALSE;
             BlockState finalSourceBlockState = sourceBlockState;
             BlockPos targetPos = targetLocator.block.getPos();
-            cc.s.getMinecraftServer().executeSync( () ->
+            cc.s.getMinecraftServer().submitAndJoin( () ->
             {
                 CarpetSettings.impendingFillSkipUpdates = !CarpetSettings.fillUpdates;
                 Clearable.clear(world.getBlockEntity(targetPos));
@@ -3089,7 +3089,7 @@ public class CarpetExpression
                 throw new InternalExpressionException("'plop' needs extra argument indicating what to plop");
             String what = lv.get(locator.offset).evalValue(c).getString();
             Value [] result = new Value[]{Value.NULL};
-            ((CarpetContext)c).s.getMinecraftServer().executeSync( () ->
+            ((CarpetContext)c).s.getMinecraftServer().submitAndJoin( () ->
             {
 
                 Boolean res = FeatureGenerator.spawn(what, ((CarpetContext) c).s.getWorld(), locator.block.getPos());
diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java
index 68f23f67..52487b01 100644
--- a/src/main/java/carpet/script/value/EntityValue.java
+++ b/src/main/java/carpet/script/value/EntityValue.java
@@ -764,7 +764,7 @@ public class EntityValue extends Value
             if (!(e instanceof LivingEntity)) return;
             LivingEntity le = (LivingEntity)e;
             if (v == null)
-                le.clearPotionEffects();
+                le.clearStatusEffects();
             else if (v instanceof ListValue)
             {
                 List<Value> lv = ((ListValue) v).getItems();
@@ -786,7 +786,7 @@ public class EntityValue extends Value
                     boolean showIcon = true;
                     if (lv.size() > 4)
                         showIcon = lv.get(4).getBoolean();
-                    le.addPotionEffect(new StatusEffectInstance(effect, duration, amplifier, showParticles, showIcon));
+                    le.addStatusEffect(new StatusEffectInstance(effect, duration, amplifier, showParticles, showIcon));
                     return;
                 }
             }
diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java
index 9e22646c..af5d9e13 100644
--- a/src/main/java/carpet/script/value/NBTSerializableValue.java
+++ b/src/main/java/carpet/script/value/NBTSerializableValue.java
@@ -139,7 +139,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
             if (blockEntity instanceof Inventory) {
                 inventory = (Inventory)blockEntity;
                 if (inventory instanceof ChestBlockEntity && block instanceof ChestBlock) {
-                    inventory = ChestBlock.getInventory(blockState, world, blockPos, true);
+                    inventory = ChestBlock.getInventory((ChestBlock)block, blockState, world, blockPos, true);
                 }
             }
         }