diff --git a/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
index 6d3a8abd6c..971b8139d9 100644
--- a/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ b/patches/server/Add-option-to-nerf-pigmen-from-nether-portals.patch
@@ -18,10 +18,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @javax.annotation.Nullable
 @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (spawnedViaMobSpawner) {
-                 nbt.putBoolean("Paper.FromMobSpawner", true);
+                 nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
              }
 +            if (fromNetherPortal) {
-+                nbt.putBoolean("Paper.FromNetherPortal", true);
++                nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
 +            }
              // Paper end
              return nbttagcompound;
diff --git a/patches/server/Entity-fromMobSpawner.patch b/patches/server/Entity-fromMobSpawner.patch
index c1b2337141..f00d0bb7e5 100644
--- a/patches/server/Entity-fromMobSpawner.patch
+++ b/patches/server/Entity-fromMobSpawner.patch
@@ -22,7 +22,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
 +            // Save entity's from mob spawner status
 +            if (spawnedViaMobSpawner) {
-+                nbt.putBoolean("Paper.FromMobSpawner", true);
++                nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
 +            }
              // Paper end
              return nbttagcompound;
diff --git a/patches/server/Entity-getEntitySpawnReason.patch b/patches/server/Entity-getEntitySpawnReason.patch
index 2235aa5277..90f8c6d333 100644
--- a/patches/server/Entity-getEntitySpawnReason.patch
+++ b/patches/server/Entity-getEntitySpawnReason.patch
@@ -75,11 +75,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ()));
              }
 +            if (spawnReason != null) {
-+                nbt.putString("Paper.SpawnReason", spawnReason.name());
++                nbttagcompound.putString("Paper.SpawnReason", spawnReason.name());
 +            }
              // Save entity's from mob spawner status
              if (spawnedViaMobSpawner) {
-                 nbt.putBoolean("Paper.FromMobSpawner", true);
+                 nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
 @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              }
  
diff --git a/patches/server/Freeze-Tick-Lock-API.patch b/patches/server/Freeze-Tick-Lock-API.patch
index 4485a65b2a..4458de1945 100644
--- a/patches/server/Freeze-Tick-Lock-API.patch
+++ b/patches/server/Freeze-Tick-Lock-API.patch
@@ -27,10 +27,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              }
 @@ -0,0 +0,0 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
              if (fromNetherPortal) {
-                 nbt.putBoolean("Paper.FromNetherPortal", true);
+                 nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
              }
 +            if (freezeLocked) {
-+                nbt.putBoolean("Paper.FreezeLock", true);
++                nbttagcompound.putBoolean("Paper.FreezeLock", true);
 +            }
              // Paper end
              return nbttagcompound;
diff --git a/patches/server/Timings-v2.patch b/patches/server/Timings-v2.patch
index db94c4f8b2..7a132ca1c3 100644
--- a/patches/server/Timings-v2.patch
+++ b/patches/server/Timings-v2.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +import com.google.common.collect.MapMaker;
 +import io.papermc.paper.configuration.GlobalConfiguration;
-+import net.minecraft.commands.CommandFunction;
++import net.minecraft.commands.functions.CommandFunction;
 +import net.minecraft.network.protocol.Packet;
 +import net.minecraft.world.level.block.Block;
 +import net.minecraft.world.level.block.entity.BlockEntity;
@@ -159,8 +159,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return Timings.ofSafe("## Packet - " + packet.getClass().getName(), packetProcessTimer);
 +    }
 +
-+    public static Timing getCommandFunctionTiming(CommandFunction function) {
-+        return Timings.ofSafe("Command Function - " + function.getId());
++    public static Timing getCommandFunctionTiming(CommandFunction<?> function) {
++        return Timings.ofSafe("Command Function - " + function.id());
 +    }
 +
 +    public static void processConfig(GlobalConfiguration.Timings config) {