diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
index f9ec40d..05d8753 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/ServerUtils.java
@@ -1,6 +1,7 @@
 package net.frankheijden.serverutils.bukkit;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import net.frankheijden.serverutils.bukkit.entities.BukkitPlugin;
@@ -46,6 +47,7 @@ public class ServerUtils extends JavaPlugin {
     public void onDisable() {
         super.onDisable();
         restoreBukkitPluginCommand();
+        RCraftServer.syncCommands(Collections.emptySet());
         plugin.disable();
     }
 
diff --git a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
index 7490b2e..0765066 100644
--- a/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
+++ b/Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
@@ -313,12 +313,15 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin, BukkitPlu
             return;
         }
 
-        for (String command : commands) {
-            map.remove(command);
+        List<Command> unregisteredCommands = new ArrayList<>();
+        for (String commandName : commands) {
+            Command command = map.remove(commandName);
+            if (command == null) continue;
+
+            unregisteredCommands.add(command);
         }
 
-        RCommandDispatcher.removeCommands(Arrays.asList(commands));
-        RCraftServer.updateCommands();
+        unregisterExactCommands(unregisteredCommands);
     }
 
     /**
diff --git a/Bungee/build.gradle.kts b/Bungee/build.gradle.kts
index de8e52d..6df6fae 100644
--- a/Bungee/build.gradle.kts
+++ b/Bungee/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     }
     implementation("org.bstats:bstats-bungeecord:${VersionConstants.bstatsVersion}")
     implementation(project(":Common"))
-    compileOnly("net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT")
+    compileOnly("net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT")
 }
 
 tasks.withType<ShadowJar> {
diff --git a/Velocity/build.gradle.kts b/Velocity/build.gradle.kts
index 90c80b9..c9499d6 100644
--- a/Velocity/build.gradle.kts
+++ b/Velocity/build.gradle.kts
@@ -23,10 +23,10 @@ dependencies {
     implementation("net.kyori:adventure-text-minimessage:${VersionConstants.adventureMinimessageVersion}") {
         exclude("net.kyori", "adventure-api")
     }
-    compileOnly("com.velocitypowered:velocity-api:3.1.0-SNAPSHOT")
+    compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
     compileOnly("com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT")
     compileOnly("com.electronwill.night-config:toml:3.6.3")
-    annotationProcessor("com.velocitypowered:velocity-api:3.1.0-SNAPSHOT")
+    annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
 }
 
 tasks {
diff --git a/build.gradle.kts b/build.gradle.kts
index 891352b..729bbd6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -39,7 +39,7 @@ subprojects {
         implementation("cloud.commandframework:cloud-brigadier:${VersionConstants.cloudVersion}")
         implementation("com.github.FrankHeijden:MinecraftReflection:1.0.0")
         implementation("com.google.code.gson:gson:2.8.6")
-        implementation("me.lucko:commodore:2.0")
+        implementation("me.lucko:commodore:2.2")
         compileOnly("com.mojang:brigadier:1.0.18")
 
         testImplementation("org.assertj:assertj-core:3.18.1")
diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt
index 3a2dcf5..42c9a55 100644
--- a/buildSrc/src/main/kotlin/VersionConstants.kt
+++ b/buildSrc/src/main/kotlin/VersionConstants.kt
@@ -1,5 +1,5 @@
 object VersionConstants {
-    const val cloudVersion = "1.7.0-SNAPSHOT"
+    const val cloudVersion = "1.8.0-SNAPSHOT"
     const val adventureVersion = "4.9.3"
     const val adventurePlatformVersion = "4.0.1"
     const val adventureMinimessageVersion = "4.2.0-SNAPSHOT"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927..249e583 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c68..ae04661 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787..a69d9cb 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..f127cfd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal