diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
index 81d91f213..87ccf8888 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingTask.java
@@ -293,16 +293,14 @@ public class CraftingTask implements ICraftingTask {
         if (processable.getPattern().isProcessing()) {
             for (ICraftingTask otherTask : network.getCraftingTasks()) {
                 for (ICraftingStep otherProcessable : otherTask.getSteps()) {
-                    if (otherProcessable.getPattern().isProcessing()) {
-                        if (otherProcessable != processable && !otherProcessable.hasReceivedOutputs() && otherProcessable.hasStartedProcessing() && otherProcessable.getPattern().getContainer().getFacingTile() != null) {
-                            if (processable.getPattern().getContainer().getFacingTile().getPos().equals(otherProcessable.getPattern().getContainer().getFacingTile().getPos())) {
-                                if (!arePatternsEqual(processable.getPattern(), otherProcessable.getPattern())) {
-                                    return false;
-                                } else {
-                                    for (ItemStack toInsert : processable.getToInsert()) {
-                                        if (ItemHandlerHelper.insertItem(processable.getPattern().getContainer().getFacingInventory(), toInsert, true) != null) {
-                                            return false;
-                                        }
+                    if (otherProcessable.getPattern().isProcessing() && otherProcessable != processable && !otherProcessable.hasReceivedOutputs() && otherProcessable.hasStartedProcessing() && otherProcessable.getPattern().getContainer().getFacingTile() != null) {
+                        if (processable.getPattern().getContainer().getFacingTile().getPos().equals(otherProcessable.getPattern().getContainer().getFacingTile().getPos())) {
+                            if (!arePatternsEqual(processable.getPattern(), otherProcessable.getPattern())) {
+                                return false;
+                            } else {
+                                for (ItemStack toInsert : processable.getToInsert()) {
+                                    if (ItemHandlerHelper.insertItem(processable.getPattern().getContainer().getFacingInventory(), toInsert, true) != null) {
+                                        return false;
                                     }
                                 }
                             }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
index 60b8ff1d4..79285ef88 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
@@ -81,22 +81,21 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
         protected void onContentsChanged(int slot) {
             super.onContentsChanged(slot);
 
-            if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER && slot < 6) {
-                RSUtils.constructFromDrive(getStackInSlot(slot), slot, itemStorages, fluidStorages, s -> new ItemStorage(s), s -> new FluidStorage(s));
+            if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) {
+                RSUtils.constructFromDrive(getStackInSlot(slot), slot, itemStorages, fluidStorages, ItemStorage::new, FluidStorage::new);
             }
         }
 
         @Override
         public ItemStack extractItem(int slot, int amount, boolean simulate) {
-            if (slot < 6) {
-                if (itemStorages[slot] != null) {
-                    itemStorages[slot].writeToNBT();
-                }
-
-                if (fluidStorages[slot] != null) {
-                    fluidStorages[slot].writeToNBT();
-                }
+            if (itemStorages[slot] != null) {
+                itemStorages[slot].writeToNBT();
             }
+
+            if (fluidStorages[slot] != null) {
+                fluidStorages[slot].writeToNBT();
+            }
+
             return super.extractItem(slot, amount, simulate);
         }
     };