diff --git a/src/main/java/com/minelittlepony/unicopia/network/Channel.java b/src/main/java/com/minelittlepony/unicopia/network/Channel.java
index 29b97d28..449a620f 100644
--- a/src/main/java/com/minelittlepony/unicopia/network/Channel.java
+++ b/src/main/java/com/minelittlepony/unicopia/network/Channel.java
@@ -32,7 +32,7 @@ public interface Channel {
 
     S2CPacketType<MsgServerResources> SERVER_RESOURCES = SimpleNetworking.serverToClient(Unicopia.id("resources"), MsgServerResources.PACKET_CODEC);
 
-    S2CPacketType<MsgTrackedValues> SERVER_TRACKED_ENTITY_DATA = SimpleNetworking.serverToClient(Unicopia.id("tracked_entity_date"), MsgTrackedValues.PACKET_CODEC);
+    S2CPacketType<MsgTrackedValues> SERVER_TRACKED_ENTITY_DATA = SimpleNetworking.serverToClient(Unicopia.id("tracked_entity_data"), MsgTrackedValues.PACKET_CODEC);
     S2CPacketType<MsgPlayerAnimationChange> SERVER_PLAYER_ANIMATION_CHANGE = SimpleNetworking.serverToClient(Unicopia.id("player_animation_change"), MsgPlayerAnimationChange.PACKET_CODEC);
     S2CPacketType<MsgSkyAngle> SERVER_SKY_ANGLE = SimpleNetworking.serverToClient(Unicopia.id("sky_angle"), MsgSkyAngle.PACKET_CODEC);
     S2CPacketType<MsgConfigurationChange> CONFIGURATION_CHANGE = SimpleNetworking.serverToClient(Unicopia.id("config"), MsgConfigurationChange.PACKET_CODEC);
diff --git a/src/main/java/com/minelittlepony/unicopia/util/serialization/PacketCodecUtils.java b/src/main/java/com/minelittlepony/unicopia/util/serialization/PacketCodecUtils.java
index 5316df9c..6633a9b3 100644
--- a/src/main/java/com/minelittlepony/unicopia/util/serialization/PacketCodecUtils.java
+++ b/src/main/java/com/minelittlepony/unicopia/util/serialization/PacketCodecUtils.java
@@ -51,7 +51,7 @@ public interface PacketCodecUtils {
     }
 
     static <B extends ByteBuf, K, V> PacketCodec.ResultFunction<B, V, Map<K, V>> toMap(Function<V, K> keyFunction) {
-        return codec -> map(HashMap::new, codec, keyFunction, -1);
+        return codec -> map(HashMap::new, codec, keyFunction, Integer.MAX_VALUE);
     }
 
     static <B extends ByteBuf, K, V, C extends Map<K, V>> PacketCodec<B, C> map(