diff --git a/src/main/java/gregtech/api/net/packets/PacketPluginSynced.java b/src/main/java/gregtech/api/net/packets/PacketPluginSynced.java
index cbb7b4f1eaf..33ebe0bb26f 100644
--- a/src/main/java/gregtech/api/net/packets/PacketPluginSynced.java
+++ b/src/main/java/gregtech/api/net/packets/PacketPluginSynced.java
@@ -10,7 +10,6 @@
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 @NoArgsConstructor
 public class PacketPluginSynced implements IPacket {
@@ -46,7 +45,7 @@ public void decode(PacketBuffer buf) {
     // TODO This could be cleaned up still
     @Override
     public void executeServer(NetHandlerPlayServer handler) {
-        TileEntity te = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(dimension).getTileEntity(pos);
+        TileEntity te = NetworkUtils.getTileEntityServer(dimension, pos);
         if (te instanceof MetaTileEntityHolder && ((MetaTileEntityHolder) te).getMetaTileEntity() instanceof MetaTileEntityMonitorScreen) {
             MonitorPluginBaseBehavior plugin = ((MetaTileEntityMonitorScreen) ((MetaTileEntityHolder) te).getMetaTileEntity()).plugin;
             if (plugin != null) {
diff --git a/src/main/java/gregtech/api/net/packets/PacketRecoverMTE.java b/src/main/java/gregtech/api/net/packets/PacketRecoverMTE.java
index e6709cfc81a..3319283d220 100644
--- a/src/main/java/gregtech/api/net/packets/PacketRecoverMTE.java
+++ b/src/main/java/gregtech/api/net/packets/PacketRecoverMTE.java
@@ -2,13 +2,12 @@
 
 import gregtech.api.metatileentity.MetaTileEntityHolder;
 import gregtech.api.net.IPacket;
+import gregtech.api.net.NetworkUtils;
 import lombok.NoArgsConstructor;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 @NoArgsConstructor
 public class PacketRecoverMTE implements IPacket {
@@ -35,9 +34,7 @@ public void decode(PacketBuffer buf) {
 
     @Override
     public void executeServer(NetHandlerPlayServer handler) {
-        World world = FMLCommonHandler.instance().getMinecraftServerInstance().getWorld(dimension);
-        TileEntity te = world.getTileEntity(pos);
-
+        TileEntity te = NetworkUtils.getTileEntityServer(dimension, pos);
         if (te instanceof MetaTileEntityHolder && ((MetaTileEntityHolder) te).isValid()) {
             ((MetaTileEntityHolder) te).sendInitialSyncData();
         }
diff --git a/src/main/java/gregtech/api/net/packets/PacketUIClientAction.java b/src/main/java/gregtech/api/net/packets/PacketUIClientAction.java
index 3e94abcc4eb..01a37aa9d27 100644
--- a/src/main/java/gregtech/api/net/packets/PacketUIClientAction.java
+++ b/src/main/java/gregtech/api/net/packets/PacketUIClientAction.java
@@ -39,11 +39,9 @@ public void decode(PacketBuffer buf) {
     @Override
     public void executeServer(NetHandlerPlayServer handler) {
         Container openContainer = handler.player.openContainer;
-        if (openContainer instanceof ModularUIContainer &&
-                openContainer.windowId == windowId) {
+        if (openContainer instanceof ModularUIContainer && openContainer.windowId == windowId) {
             ModularUI modularUI = ((ModularUIContainer) openContainer).getModularUI();
-            PacketBuffer buffer = updateData;
-            modularUI.guiWidgets.get(widgetId).handleClientAction(buffer.readVarInt(), buffer);
+            modularUI.guiWidgets.get(widgetId).handleClientAction(updateData.readVarInt(), updateData);
         }
     }
 }