diff --git a/buildSrc/src/main/kotlin/Properties.kt b/buildSrc/src/main/kotlin/Properties.kt
index d29c1a3..1005e5b 100644
--- a/buildSrc/src/main/kotlin/Properties.kt
+++ b/buildSrc/src/main/kotlin/Properties.kt
@@ -10,19 +10,19 @@ object Properties {
 
     /* Paper */
     const val paperApiVersion = "1.19"
-    const val paperMinecraftDevVersion = "1.21"
-    const val paperDevBundleVersion = "1.21-R0.1-SNAPSHOT"
+    const val paperMinecraftDevVersion = "1.21.3"
+    const val paperDevBundleVersion = "1.21.3-R0.1-SNAPSHOT"
 
     /* Fabric (https://fabricmc.net/develop) */
     const val fabricLoaderRequiredVersion = "0.14.22"
-    const val fabricMinecraftDevVersion = "1.21"
-    const val yarnMappingsDevVersion = "$fabricMinecraftDevVersion+build.7"
-    const val fabricLoaderDevVersion = "0.15.11"
-    const val fabricApiDevVersion = "0.100.4+$fabricMinecraftDevVersion"
+    const val fabricMinecraftDevVersion = "1.21.3"
+    const val yarnMappingsDevVersion = "$fabricMinecraftDevVersion+build.2"
+    const val fabricLoaderDevVersion = "0.16.9"
+    const val fabricApiDevVersion = "0.107.3+$fabricMinecraftDevVersion"
 
     /* Dependencies */
     const val voicechatApiVersion = "2.4.11"
-    const val voicechatModRuntimeVersion = "2.5.16"
+    const val voicechatModRuntimeVersion = "2.5.25"
     const val yamlConfigurationVersion = "2.0.2"
     const val javaSemverVersion = "0.10.2"
     const val gsonVersion = "2.10.1"
@@ -42,7 +42,11 @@ object Properties {
         "1.20.4",
         "1.20.5",
         "1.20.6",
-        "1.21"
+        "1.21",
+        "1.21.1",
+        "1.21.2",
+        "1.21.3",
+        "1.21.4"
     )
 
     /* Gradle Plugins */
diff --git a/fabric/src/main/java/dev/amsam0/voicechatdiscord/FabricPlatform.java b/fabric/src/main/java/dev/amsam0/voicechatdiscord/FabricPlatform.java
index 2097e4f..92c7409 100644
--- a/fabric/src/main/java/dev/amsam0/voicechatdiscord/FabricPlatform.java
+++ b/fabric/src/main/java/dev/amsam0/voicechatdiscord/FabricPlatform.java
@@ -75,7 +75,7 @@ else if (sender instanceof CommandContext<?> context) {
     }
 
     public void sendMessage(Player player, String message) {
-        ((PlayerEntity) player.getPlayer()).sendMessage(toNative(mm(message)));
+        ((ServerPlayerEntity) player.getPlayer()).sendMessage(toNative(mm(message)));
     }
 
     public String getName(Player player) {
diff --git a/paper/src/main/java/dev/amsam0/voicechatdiscord/PaperPlatform.java b/paper/src/main/java/dev/amsam0/voicechatdiscord/PaperPlatform.java
index cb70ecf..9fc5170 100644
--- a/paper/src/main/java/dev/amsam0/voicechatdiscord/PaperPlatform.java
+++ b/paper/src/main/java/dev/amsam0/voicechatdiscord/PaperPlatform.java
@@ -4,6 +4,7 @@
 import de.maxhenkel.voicechat.api.Position;
 import de.maxhenkel.voicechat.api.ServerLevel;
 import de.maxhenkel.voicechat.api.ServerPlayer;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
@@ -56,7 +57,7 @@ public ServerPlayer commandContextToPlayer(CommandContext<?> context) {
             }
         }
         if (nmsEntity == null) return null;
-        @SuppressWarnings("DataFlowIssue") Entity entity = (Entity) nmsEntity.getBukkitSender(null);
+        Entity entity = nmsEntity.getBukkitEntity();
         return api.createPosition(
                 entity.getLocation().getX(),
                 entity.getLocation().getY(),