diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
index 51fa01ba..e91db5c2 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java
@@ -170,6 +170,7 @@ public class Protocol1_13_2To1_14 extends BackwardsProtocol<ClientboundPackets1_
                             wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
                         }
 
+                        //TODO Soft memory leak: Don't store light if chunk is already loaded
                         wrapper.user().get(ChunkLightStorage.class).setStoredLight(skyLight, blockLight, x, z);
                         wrapper.cancel();
                     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
index 3f3be4b5..9e2c8835 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java
@@ -77,6 +77,7 @@ public final class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17
                 map(Type.STRING_ARRAY); // Worlds
                 map(Type.NBT); // Dimension registry
                 map(Type.NBT); // Current dimension data
+                map(Type.STRING); // World
                 handler(wrapper -> {
                     byte previousGamemode = wrapper.get(Type.BYTE, 0);
                     if (previousGamemode == -1) { // "Unset" gamemode removed
@@ -113,6 +114,7 @@ public final class EntityPackets1_17 extends EntityRewriter<Protocol1_16_4To1_17
             @Override
             public void registerMap() {
                 map(Type.NBT); // Dimension data
+                map(Type.STRING); // World
                 handler(worldDataTrackerHandler(0));
                 handler(wrapper -> reduceExtendedHeight(wrapper.get(Type.NBT, 0), true));
             }