diff --git a/patches/server/1039-fixup-MC-Utils.patch b/patches/server/1039-fixup-MC-Utils.patch
index 02b062b0b1..90cd0e9d64 100644
--- a/patches/server/1039-fixup-MC-Utils.patch
+++ b/patches/server/1039-fixup-MC-Utils.patch
@@ -1329,6 +1329,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          }
          // Paper end - chunk system hooks
          if (!this.addEntityUuid(entity)) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+             }
+         }
+ 
+-        ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority priority;
++        ca.spottedleaf.concurrentutil.util.Priority priority;
+         if (urgent) {
+-            priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHER;
++            priority = ca.spottedleaf.concurrentutil.util.Priority.HIGHER;
+         } else {
+-            priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL;
++            priority = ca.spottedleaf.concurrentutil.util.Priority.NORMAL;
+         }
+ 
+         java.util.concurrent.CompletableFuture<Chunk> ret = new java.util.concurrent.CompletableFuture<>();
 diff --git a/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks b/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks
 new file mode 100644
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
diff --git a/patches/server/Moonrise-optimisation-patches.patch b/patches/server/Moonrise-optimisation-patches.patch
index fe4ccdc0ec..87f4d5aabd 100644
--- a/patches/server/Moonrise-optimisation-patches.patch
+++ b/patches/server/Moonrise-optimisation-patches.patch
@@ -10372,7 +10372,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +
 +        // Don't really have a choice but to place this hook here
-+        PlatformHooks.get().onChunkHolderTicketChange(this.world, this, oldLevel, newLevel);
++        PlatformHooks.get().onChunkHolderTicketChange(this.world, this.vanillaChunkHolder, oldLevel, newLevel);
 +    }
 +
 +    static final int NEIGHBOUR_RADIUS = 2;
@@ -14401,7 +14401,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +            try {
 +                // run converters
-+                final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data);
++                final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data, new ChunkPos(this.chunkX, this.chunkZ)); // Paper
 +
 +                // unpack the data
 +                final SerializableChunkData chunkData = SerializableChunkData.parse(