diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinInventory.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinInventory.java
index 981e1f8cd..b2104d243 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinInventory.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinInventory.java
@@ -10,6 +10,7 @@ import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.registries.ForgeRegistries;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -23,7 +24,9 @@ import java.util.function.Predicate;
 
 @Mixin(Inventory.class)
 public class MixinInventory {
-	@Shadow Player player;
+	@Final
+	@Shadow
+	public Player player;
 
 	@Inject(
 		method = "add(ILnet/minecraft/world/item/ItemStack;)Z",
diff --git a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java
index b9a744c07..0ea0fe3f3 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/mixin/MixinLivingEntity.java
@@ -15,8 +15,6 @@ import ru.dbotthepony.mc.otm.config.ServerConfig;
 import ru.dbotthepony.mc.otm.core.util.ExperienceUtilsKt;
 import ru.dbotthepony.mc.otm.registry.MItems;
 
-import java.util.Random;
-
 @SuppressWarnings("ConstantConditions")
 @Mixin(LivingEntity.class)
 public class MixinLivingEntity {
@@ -38,7 +36,8 @@ public class MixinLivingEntity {
 		}
 	}
 
-	@Shadow Player lastHurtByPlayer;
+	@Shadow
+	protected Player lastHurtByPlayer;
 
 	@Inject(
 		method = "dropExperience()V",