diff --git a/patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
similarity index 100%
rename from patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
rename to patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch
diff --git a/patches/unapplied/server/Make-CallbackExecutor-strict-again.patch b/patches/server/Make-CallbackExecutor-strict-again.patch
similarity index 100%
rename from patches/unapplied/server/Make-CallbackExecutor-strict-again.patch
rename to patches/server/Make-CallbackExecutor-strict-again.patch
diff --git a/patches/unapplied/server/Vanilla-command-permission-fixes.patch b/patches/server/Vanilla-command-permission-fixes.patch
similarity index 96%
rename from patches/unapplied/server/Vanilla-command-permission-fixes.patch
rename to patches/server/Vanilla-command-permission-fixes.patch
index 1ff7f61e04..e224be53da 100644
--- a/patches/unapplied/server/Vanilla-command-permission-fixes.patch
+++ b/patches/server/Vanilla-command-permission-fixes.patch
@@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        // Paper end
          this.dispatcher.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
-             // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.b.getPath(commandnode1), this.b.getPath(commandnode2), collection); // CraftBukkit
+             // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.dispatcher.getPath(commandnode1), this.dispatcher.getPath(commandnode2), collection); // CraftBukkit
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644