diff --git a/patches/server/Add-BlockBreakBlockEvent.patch b/patches/server/Add-BlockBreakBlockEvent.patch
index c09def6a4e..a69674fc5e 100644
--- a/patches/server/Add-BlockBreakBlockEvent.patch
+++ b/patches/server/Add-BlockBreakBlockEvent.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            for (var drop : event.getDrops()) {
 +                popResource(world.getMinecraftWorld(), pos, org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(drop));
 +            }
-+            state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY);
++            state.spawnAfterBreak(world.getMinecraftWorld(), pos, ItemStack.EMPTY, true);
 +        }
 +        return true;
 +    }
diff --git a/patches/server/Fix-and-optimise-world-force-upgrading.patch b/patches/server/Fix-and-optimise-world-force-upgrading.patch
index e02699b2c1..c2b8080f37 100644
--- a/patches/server/Fix-and-optimise-world-force-upgrading.patch
+++ b/patches/server/Fix-and-optimise-world-force-upgrading.patch
@@ -263,7 +263,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    public static void convertWorldButItWorks(net.minecraft.resources.ResourceKey<net.minecraft.world.level.dimension.LevelStem> dimensionType, net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess worldSession,
 +                                              DataFixer dataFixer, Optional<net.minecraft.resources.ResourceKey<com.mojang.serialization.Codec<? extends net.minecraft.world.level.chunk.ChunkGenerator>>> generatorKey, boolean removeCaches) {
 +        int threads = Runtime.getRuntime().availableProcessors() * 3 / 8;
-+        final ThreadedWorldUpgrader worldUpgrader = new ThreadedWorldUpgrader(dimensionType, worldSession.getLevelId(), worldSession.levelPath.toFile(), threads, dataFixer, generatorKey, removeCaches);
++        final ThreadedWorldUpgrader worldUpgrader = new ThreadedWorldUpgrader(dimensionType, worldSession.getLevelId(), worldSession.levelDirectory.path().toFile(), threads, dataFixer, generatorKey, removeCaches);
 +        worldUpgrader.convert();
 +    }
 +    // Paper end - fix and optimise world upgrading
diff --git a/patches/server/Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/Fix-commands-from-signs-not-firing-command-events.patch
index 05823338a1..59b4a2eb33 100644
--- a/patches/server/Fix-commands-from-signs-not-firing-command-events.patch
+++ b/patches/server/Fix-commands-from-signs-not-firing-command-events.patch
@@ -47,8 +47,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public void sendMessage(Component message, UUID sender) {
-+        delegate.sendMessage(message, sender);
++    public void sendSystemMessage(Component message) {
++        delegate.sendSystemMessage(message);
 +    }
 +
 +    @Override
@@ -108,8 +108,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        // Paper start - send messages back to the player
 +        CommandSource commandSource = this.level.paperConfig.showSignClickCommandFailureMessagesToPlayer ? new io.papermc.paper.commands.DelegatingCommandSource(this) {
 +            @Override
-+            public void sendMessage(Component message, UUID sender) {
-+                player.sendMessage(message, sender);
++            public void sendSystemMessage(Component message) {
++                player.sendSystemMessage(message);
 +            }
 +
 +            @Override