diff --git a/src/main/java/gregtech/api/capability/GregtechDataCodes.java b/src/main/java/gregtech/api/capability/GregtechDataCodes.java
index 379f791465c..19058699a19 100644
--- a/src/main/java/gregtech/api/capability/GregtechDataCodes.java
+++ b/src/main/java/gregtech/api/capability/GregtechDataCodes.java
@@ -9,8 +9,6 @@
 
 public class GregtechDataCodes {
 
-    public static final int UPDATE_PRIVATE = assignId();
-    public static final int LOCK_FILL = assignId();
     private static int nextId = 0;
 
     public static int assignId() {
@@ -97,6 +95,7 @@ public static int assignId() {
     public static final int MAINTENANCE_MULTIPLIER = assignId();
     public static final int UPDATE_UPWARDS_FACING = assignId();
     public static final int UPDATE_FLIP = assignId();
+    public static final int LOCK_FILL = assignId();
 
     // Item Bus Item Stack Auto Collapsing
     public static final int TOGGLE_COLLAPSE_ITEMS = assignId();
@@ -157,6 +156,9 @@ public static int assignId() {
     // Detector Covers
     public static final int UPDATE_INVERTED = assignId();
 
+    // Ender Covers
+    public static final int UPDATE_PRIVATE = assignId();
+
     // HPCA / Research Station
     public static final int DAMAGE_STATE = assignId();
     public static final int LOCK_OBJECT_HOLDER = assignId();
diff --git a/src/main/java/gregtech/api/cover/CoverSaveHandler.java b/src/main/java/gregtech/api/cover/CoverSaveHandler.java
index e9041d022f3..fe62aa782a9 100644
--- a/src/main/java/gregtech/api/cover/CoverSaveHandler.java
+++ b/src/main/java/gregtech/api/cover/CoverSaveHandler.java
@@ -1,6 +1,5 @@
 package gregtech.api.cover;
 
-import gregtech.api.metatileentity.interfaces.ISyncedTileEntity;
 import gregtech.api.util.GTLog;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -67,7 +66,6 @@ public static void receiveInitialSyncData(@NotNull PacketBuffer buf, @NotNull Co
             } else {
                 Cover cover = definition.createCover(coverHolder, facing);
                 cover.readInitialSyncData(buf);
-                ISyncedTileEntity.checkInitialData(buf, cover);
                 coverHolder.addCover(facing, cover);
             }
         }
@@ -109,7 +107,6 @@ public static void readCoverPlacement(@NotNull PacketBuffer buf, @NotNull CoverH
             coverHolder.addCover(placementSide, cover);
 
             cover.readInitialSyncData(buf);
-            ISyncedTileEntity.checkInitialData(buf, cover);
         }
         coverHolder.scheduleRenderUpdate();
     }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 611cb125922..c89fe48379d 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -1045,7 +1045,6 @@ public void receiveInitialSyncData(@NotNull PacketBuffer buf) {
                 GTLog.logger.warn("Could not find MTETrait for id: {} at position {}.", traitNetworkId, getPos());
             } else {
                 trait.receiveInitialSyncData(buf);
-                ISyncedTileEntity.checkInitialData(buf, trait);
             }
         }
         CoverSaveHandler.receiveInitialSyncData(buf, this);
@@ -1085,6 +1084,8 @@ public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
                 GTLog.logger.warn("Could not find MTETrait for id: {} at position {}.", traitNetworkId, getPos());
             } else {
                 trait.receiveCustomData(internalId, buf);
+
+                // this should be fine, as nothing else is read after this
                 ISyncedTileEntity.checkCustomData(internalId, buf, trait);
             }
         } else if (dataId == COVER_ATTACHED_MTE) {
@@ -1102,6 +1103,8 @@ public void receiveCustomData(int dataId, @NotNull PacketBuffer buf) {
             int internalId = buf.readVarInt();
             if (cover != null) {
                 cover.readCustomData(internalId, buf);
+
+                // this should be fine, as nothing else is read after this
                 ISyncedTileEntity.checkCustomData(internalId, buf, cover);
             }
         } else if (dataId == UPDATE_SOUND_MUFFLED) {