diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java
index 5551da27b..81961e5d5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/IRSAPI.java
@@ -43,9 +43,9 @@ public interface IRSAPI {
     INetworkNodeManager getNetworkNodeManager(int dimension);
 
     /**
-     * @return the storage disk behavior
+     * @return the default storage disk behavior
      */
-    IStorageDiskBehavior getStorageDiskBehavior();
+    IStorageDiskBehavior getDefaultStorageDiskBehavior();
 
     /**
      * @return the solderer registry
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
index 3a7696195..9003579a5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/API.java
@@ -106,7 +106,7 @@ public class API implements IRSAPI {
     }
 
     @Override
-    public IStorageDiskBehavior getStorageDiskBehavior() {
+    public IStorageDiskBehavior getDefaultStorageDiskBehavior() {
         return storageDiskBehavior;
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
index cd2797a94..bb9454d88 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
@@ -38,8 +38,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
     private int type = IType.ITEMS;
     private int ioMode = IO_MODE_INSERT;
 
-    private IStorageDisk[] itemStorages = new IStorageDisk[8];
-    private IStorageDisk[] fluidStorages = new IStorageDisk[8];
+    private IStorageDisk[] itemStorages = new IStorageDisk[6];
+    private IStorageDisk[] fluidStorages = new IStorageDisk[6];
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ItemHandlerListenerNetworkNode(this), ItemUpgrade.TYPE_SPEED, ItemUpgrade.TYPE_STACK);
 
@@ -244,15 +244,8 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
         int i = 0;
 
         while (extracted == null && storage.getStacks().size() > i) {
-            FluidStack stack = storage.getStacks().get(i);
-
-            while (stack == null && storage.getStacks().size() > i) {
-                i++;
-            }
-
-            if (stack != null) {
-                extracted = storage.extract(stack, upgrades.getItemInteractCount(), compare, false);
-            }
+            FluidStack stack = storage.getStacks().get(i++);
+            extracted = storage.extract(stack, upgrades.getItemInteractCount(), compare, false);
         }
 
         if (extracted == null) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
index 1271174a0..c08ece566 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
@@ -48,13 +48,13 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
     @Override
     public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
         for (int i = 0; i < 5; ++i) {
-            subItems.add(API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(item, 1, i)));
+            subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(item, 1, i)));
         }
     }
 
     private void applyDebugDiskData(ItemStack stack) {
         if (debugDiskTag == null) {
-            debugDiskTag = API.instance().getStorageDiskBehavior().getTag(StorageDiskType.FLUIDS);
+            debugDiskTag = API.instance().getDefaultStorageDiskBehavior().getTag(StorageDiskType.FLUIDS);
 
             StorageDiskFluid storage = new StorageDiskFluid(debugDiskTag, -1);
 
@@ -76,7 +76,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
             if (stack.getMetadata() == TYPE_DEBUG) {
                 applyDebugDiskData(stack);
             } else {
-                API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
+                API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
             }
         }
     }
@@ -117,7 +117,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
     public void onCreated(ItemStack stack, World world, EntityPlayer player) {
         super.onCreated(stack, world, player);
 
-        API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
+        API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, stack);
     }
 
     @Override
@@ -127,12 +127,12 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
 
     @Override
     public NBTTagCompound getNBTShareTag(ItemStack stack) {
-        return API.instance().getStorageDiskBehavior().getShareTag(StorageDiskType.FLUIDS, stack);
+        return API.instance().getDefaultStorageDiskBehavior().getShareTag(StorageDiskType.FLUIDS, stack);
     }
 
     @Nonnull
     @Override
     public IStorageDisk<FluidStack> create(ItemStack disk) {
-        return API.instance().getStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity());
+        return API.instance().getDefaultStorageDiskBehavior().createFluidStorage(disk.getTagCompound(), EnumFluidStorageType.getById(disk.getItemDamage()).getCapacity());
     }
 }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
index 0eff2b843..a41654176 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
@@ -46,7 +46,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
     @Override
     public void getSubItems(Item item, CreativeTabs tab, NonNullList<ItemStack> subItems) {
         for (int i = 0; i < 5; ++i) {
-            subItems.add(API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(item, 1, i)));
+            subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(item, 1, i)));
         }
     }
 
@@ -58,14 +58,14 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
             if (stack.getItemDamage() == TYPE_DEBUG) {
                 applyDebugDiskData(stack);
             } else {
-                API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
+                API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
             }
         }
     }
 
     private void applyDebugDiskData(ItemStack stack) {
         if (debugDiskTag == null) {
-            debugDiskTag = API.instance().getStorageDiskBehavior().getTag(StorageDiskType.ITEMS);
+            debugDiskTag = API.instance().getDefaultStorageDiskBehavior().getTag(StorageDiskType.ITEMS);
 
             StorageDiskItem storage = new StorageDiskItem(debugDiskTag, -1);
 
@@ -127,7 +127,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
     public void onCreated(ItemStack stack, World world, EntityPlayer player) {
         super.onCreated(stack, world, player);
 
-        API.instance().getStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
+        API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, stack);
     }
 
     @Override
@@ -137,12 +137,12 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
 
     @Override
     public NBTTagCompound getNBTShareTag(ItemStack stack) {
-        return API.instance().getStorageDiskBehavior().getShareTag(StorageDiskType.ITEMS, stack);
+        return API.instance().getDefaultStorageDiskBehavior().getShareTag(StorageDiskType.ITEMS, stack);
     }
 
     @Nonnull
     @Override
     public IStorageDisk<ItemStack> create(ItemStack disk) {
-        return API.instance().getStorageDiskBehavior().createItemStorage(disk.getTagCompound(), EnumItemStorageType.getById(disk.getItemDamage()).getCapacity());
+        return API.instance().getDefaultStorageDiskBehavior().createItemStorage(disk.getTagCompound(), EnumItemStorageType.getById(disk.getItemDamage()).getCapacity());
     }
 }