diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkMaster.java b/src/main/java/refinedstorage/apiimpl/network/NetworkMaster.java
index c7a5c0ab6..6c02e0969 100755
--- a/src/main/java/refinedstorage/apiimpl/network/NetworkMaster.java
+++ b/src/main/java/refinedstorage/apiimpl/network/NetworkMaster.java
@@ -172,6 +172,7 @@ public class NetworkMaster implements INetworkMaster {
                 INetworkSlave slave = slaves.next();
 
                 if (slave.canUpdate()) {
+                    System.out.println("Updating slave " + slave);
                     slave.updateSlave();
                 }
 
@@ -185,6 +186,7 @@ public class NetworkMaster implements INetworkMaster {
                     }
                 }
             }
+            System.out.println("===Done===");
 
             for (ICraftingTask taskToCancel : craftingTasksToCancel) {
                 taskToCancel.onCancelled(this);
diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkMasterEventHandler.java b/src/main/java/refinedstorage/apiimpl/network/NetworkMasterEventHandler.java
index 0ee1566d6..f48fe9c3f 100755
--- a/src/main/java/refinedstorage/apiimpl/network/NetworkMasterEventHandler.java
+++ b/src/main/java/refinedstorage/apiimpl/network/NetworkMasterEventHandler.java
@@ -11,22 +11,26 @@ import java.util.Map;
 public class NetworkMasterEventHandler {
     @SubscribeEvent
     public void onWorldTick(TickEvent.WorldTickEvent e) {
-        Map<BlockPos, INetworkMaster> networks = NetworkMasterRegistry.get(e.world);
+        if (e.phase == TickEvent.Phase.START) {
+            Map<BlockPos, INetworkMaster> networks = NetworkMasterRegistry.get(e.world);
 
-        if (networks != null) {
-            for (INetworkMaster network : networks.values()) {
-                if (network.getWorld() == null) {
-                    network.setWorld(e.world);
+            if (networks != null) {
+                for (INetworkMaster network : networks.values()) {
+                    if (network.getWorld() == null) {
+                        network.setWorld(e.world);
+                    }
+
+                    network.update();
                 }
-
-                network.update();
             }
         }
     }
 
     @SubscribeEvent
     public void onWorldLoad(WorldEvent.Load e) {
-        NetworkMasterSavedData.getOrLoad(e.getWorld());
+        if (!e.getWorld().isRemote) {
+            NetworkMasterSavedData.getOrLoad(e.getWorld());
+        }
     }
 
     @SubscribeEvent
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 5183f4469..1b4145da5 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -243,7 +243,7 @@ public class GuiGrid extends GuiBase {
 
     @Override
     public void drawForeground(int mouseX, int mouseY) {
-        drawString(7, 8, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
+        drawString(7, 7, t(grid instanceof WirelessGrid ? "gui.refinedstorage:wireless_grid" : "gui.refinedstorage:grid"));
 
         if (grid.getType() == EnumGridType.CRAFTING) {
             drawString(7, 95, t("container.crafting"));