diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index cb62e6770..8c8adc326 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -55,16 +55,18 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
 
-            ItemStack disk = getStackInSlot(slot);
+            if (!worldObj.isRemote) {
+                ItemStack disk = getStackInSlot(slot);
 
-            if (disk == null) {
-                storages[slot] = null;
-            } else {
-                storages[slot] = new Storage(disk);
-            }
+                if (disk == null) {
+                    storages[slot] = null;
+                } else {
+                    storages[slot] = new Storage(disk);
+                }
 
-            if (isConnected()) {
-                network.getItems().rebuild(network);
+                if (isConnected()) {
+                    network.getItems().rebuild(network);
+                }
             }
         }
 
@@ -115,7 +117,7 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
 
     @Override
     public void addStorages(List<IStorage> storages) {
-        for (IStorage storage : storages) {
+        for (IStorage storage : this.storages) {
             if (storage != null) {
                 storages.add(storage);
             }
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index e17842d95..40fcfe06f 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -89,7 +89,6 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage
     }
 
     @Override
-
     public void addStorages(List<IStorage> storages) {
         if (storage != null) {
             storages.add(storage);
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index f2375f5e8..1aa854bff 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -132,6 +132,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
             slavesToRemove.clear();
 
             if (rebuildItemList) {
+                System.out.println("Rebuilding item list");
                 items.rebuild(this);
 
                 rebuildItemList = false;
@@ -430,7 +431,6 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     @Override
     public ItemStack push(ItemStack stack, int size, boolean simulate) {
         if (stack == null || stack.getItem() == null || items.getStorages().isEmpty()) {
-            System.out.println("Cannot push!");
             return ItemHandlerHelper.copyStackWithSize(stack, size);
         }