diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java
index 0cd08eb..374bb3b 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/PlayerManagerMixin.java
@@ -21,7 +21,6 @@
 
 import net.minecraft.entity.Entity;
 import net.minecraft.network.ClientConnection;
-import net.minecraft.network.packet.s2c.play.PositionFlag;
 import net.minecraft.server.PlayerManager;
 import net.minecraft.server.network.ConnectedClientData;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -105,7 +104,7 @@ public void onRespawnPlayer(
         // This target lets us modify respawn position and dimension (player maybe not _fully_ initialized, still)
         target = "Lnet/minecraft/server/network/ServerPlayerEntity;<init>(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)V"
     ))
-    public void onRespawnPlayer_forResawnLocationOverwrite(
+    public void onRespawnPlayer_forRespawnLocationOverwrite(
         CallbackInfoReturnable<ServerPlayerEntity> cir
         , @Local(ordinal = 0, argsOnly = true) ServerPlayerEntity oldServerPlayerEntity
         , @Local(ordinal = 0) LocalRef<TeleportTarget> teleportTargetLocalRef
diff --git a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java b/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java
index 4a83973..25625bf 100644
--- a/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java
+++ b/src/main/java/com/fibermc/essentialcommands/mixin/ServerPlayerEntityMixin.java
@@ -37,9 +37,6 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntityMixin implemen
     @Shadow
     public abstract boolean isSpectator();
 
-    @Shadow
-    public abstract boolean damage(ServerWorld world, DamageSource source, float amount);
-
     @Unique
     public QueuedTeleport ecQueuedTeleport;
 
@@ -69,13 +66,13 @@ public void onChangeGameMode(GameMode gameMode, CallbackInfoReturnable<Boolean>
         target = "Lnet/minecraft/server/PlayerManager;sendPlayerStatus(Lnet/minecraft/server/network/ServerPlayerEntity;)V"
     ))
     public void onTeleportBetweenWorlds(TeleportTarget teleportTarget, CallbackInfoReturnable<Entity> cir) {
-        var playerData = ((ServerPlayerEntityAccess) this).ec$getPlayerData();
+        var playerData = this.ec$getPlayerData();
         playerData.updatePlayerEntity((ServerPlayerEntity) (Object) this);
     }
 
     @Inject(method = "worldChanged", at = @At(value = "RETURN"))
     public void onWorldChanged(ServerWorld origin, CallbackInfo ci) {
-        var playerData = ((ServerPlayerEntityAccess) this).ec$getPlayerData();
+        var playerData = this.ec$getPlayerData();
         if (CONFIG.RECHECK_PLAYER_ABILITY_PERMISSIONS_ON_DIMENSION_CHANGE) {
             PlayerDataManager.getInstance().scheduleTask(playerData::clearAbilitiesWithoutPermisisons);
         }
@@ -163,7 +160,7 @@ public void getPlayerListName(CallbackInfoReturnable<Text> cir) {
     }
 
     // Teleport hook (for /back)
-    @Inject(method = "Lnet/minecraft/server/network/ServerPlayerEntity;teleport(Lnet/minecraft/server/world/ServerWorld;DDDLjava/util/Set;FFZ)Z", at = @At("HEAD"))
+    @Inject(method = "teleport(Lnet/minecraft/server/world/ServerWorld;DDDLjava/util/Set;FFZ)Z", at = @At("HEAD"))
     public void onTeleport(ServerWorld world, double destX, double destY, double destZ, Set<PositionFlag> flags, float yaw, float pitch, boolean resetCamera, CallbackInfoReturnable<Boolean> cir) {
         if (!isSpectator()) {
             this.ec$getPlayerData().setPreviousLocation(new MinecraftLocation((ServerPlayerEntity) (Object) this));