diff --git a/mappings/net/minecraft/block/BlockDeadbush.mapping b/mappings/net/minecraft/block/BlockDeadbush.mapping
index cf28abad96..8391530c55 100644
--- a/mappings/net/minecraft/block/BlockDeadbush.mapping
+++ b/mappings/net/minecraft/block/BlockDeadbush.mapping
@@ -1,5 +1,5 @@
 CLASS aoi net/minecraft/block/BlockDeadbush
-	FIELD a BOX Lbfm;
+	FIELD a BOX_DEADBUSH Lbfm;
 	METHOD a afterBreak (Lali;Lacu;Ldx;Lave;Latu;Lahf;)V
 		ARG 0 world
 		ARG 1 player
diff --git a/mappings/net/minecraft/block/BlockSapling.mapping b/mappings/net/minecraft/block/BlockSapling.mapping
index f6fb52bb58..a4ea437ab7 100644
--- a/mappings/net/minecraft/block/BlockSapling.mapping
+++ b/mappings/net/minecraft/block/BlockSapling.mapping
@@ -1,7 +1,7 @@
 CLASS asd net/minecraft/block/BlockSapling
 	FIELD a TYPE Lavs;
 	FIELD c STAGE Lavt;
-	FIELD d BOX Lbfm;
+	FIELD d BOX_SAPLING Lbfm;
 	METHOD a deserializeState (I)Lave;
 		ARG 0 meta
 	METHOD a addStacksForDisplay (Lahd;Lagf;Lem;)V
diff --git a/mappings/net/minecraft/entity/ai/AiGoalTrackTarget.mapping b/mappings/net/minecraft/entity/ai/AiGoalTrackTarget.mapping
index c696f9c3b2..583b920623 100644
--- a/mappings/net/minecraft/entity/ai/AiGoalTrackTarget.mapping
+++ b/mappings/net/minecraft/entity/ai/AiGoalTrackTarget.mapping
@@ -5,7 +5,6 @@ CLASS xu net/minecraft/entity/ai/AiGoalTrackTarget
 	FIELD d timeWithoutVisibility I
 	FIELD e entity Lus;
 	FIELD f checkVisibility Z
-	FIELD g target Luk;
 	FIELD h maxTimeWithoutVisibility I
 	METHOD <init> (Lus;Z)V
 		ARG 0 entity
diff --git a/mappings/net/minecraft/entity/player/EntityPlayer.mapping b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
index 11969807e1..a55fbd7077 100644
--- a/mappings/net/minecraft/entity/player/EntityPlayer.mapping
+++ b/mappings/net/minecraft/entity/player/EntityPlayer.mapping
@@ -139,7 +139,7 @@ CLASS acu net/minecraft/entity/player/EntityPlayer
 		ARG 0 value
 	METHOD c isUsingEffectiveTool (Lave;)Z
 		ARG 0 state
-	METHOD c registerTagUpgraders (Lqv;)V
+	METHOD c registerTagUpgradersServer (Lqv;)V
 		ARG 0 handler
 	METHOD cA getMainHand ()Luj;
 	METHOD cP getScore ()I