diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java
index 2b8ae84b..7089b55e 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java
@@ -96,7 +96,7 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
     }
 
     private void storeTags(final PacketWrapper wrapper) {
-        tagRewriter.getGenericHandler().handle(wrapper);
+        tagRewriter.handleGeneric(wrapper);
         wrapper.resetReader();
         wrapper.user().get(ItemTagStorage.class).readItemTags(wrapper);
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
index e82a71c9..879dda48 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java
@@ -182,6 +182,9 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
         registerBlockStateHandler(EntityTypes1_20_5.ABSTRACT_MINECART, 11);
 
         filter().type(EntityTypes1_20_5.SALMON).removeIndex(17); // Data type
+        filter().type(EntityTypes1_20_5.DOLPHIN).removeIndex(16); // Baby
+        filter().type(EntityTypes1_20_5.GLOW_SQUID).removeIndex(16); // Baby
+        filter().type(EntityTypes1_20_5.SQUID).removeIndex(16); // Baby
     }
 
     @Override