diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
index 094949e39..00655c0e0 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerBase.java
@@ -195,7 +195,7 @@ public abstract class ContainerBase extends Container {
         return ItemStack.EMPTY;
     }
 
-    protected ItemStack mergeItemStackToSpecimen(ItemStack stack, int begin, int end) {
+    protected ItemStack mergeItemStackToFilters(ItemStack stack, int begin, int end) {
         for (int i = begin; i < end; ++i) {
             if (API.instance().getComparer().isEqualNoQuantity(getStackFromSlot(getSlot(i)), stack)) {
                 return ItemStack.EMPTY;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java
index deb60383d..f2287223a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerConstructor.java
@@ -34,7 +34,7 @@ public class ContainerConstructor extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4, false)) {
-                return mergeItemStackToSpecimen(stack, 4, 4 + 1);
+                return mergeItemStackToFilters(stack, 4, 4 + 1);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java
index c77aeacd5..9e50473eb 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java
@@ -36,7 +36,7 @@ public class ContainerDestructor extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4, false)) {
-                return mergeItemStackToSpecimen(stack, 4, 4 + 9);
+                return mergeItemStackToFilters(stack, 4, 4 + 9);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java
index 6292c13a6..efd16ddf6 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDetector.java
@@ -20,7 +20,7 @@ public class ContainerDetector extends ContainerBase {
         Slot slot = getSlot(index);
 
         if (slot.getHasStack() && index > 0) {
-            return mergeItemStackToSpecimen(slot.getStack(), 0, 1);
+            return mergeItemStackToFilters(slot.getStack(), 0, 1);
         }
 
         return null;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java
index cc53670ce..4e13d987d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskDrive.java
@@ -39,7 +39,7 @@ public class ContainerDiskDrive extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 8, false)) {
-                return mergeItemStackToSpecimen(stack, 8, 8 + 9);
+                return mergeItemStackToFilters(stack, 8, 8 + 9);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java
index 1fa3351be..d333377ce 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDiskManipulator.java
@@ -44,7 +44,7 @@ public class ContainerDiskManipulator extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4 + 3, false)) {
-                return mergeItemStackToSpecimen(stack, 4 + 6, 4 + 6 + 9);
+                return mergeItemStackToFilters(stack, 4 + 6, 4 + 6 + 9);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java
index a8c37d9dc..7f812e5b1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExporter.java
@@ -36,7 +36,7 @@ public class ContainerExporter extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4, false)) {
-                return mergeItemStackToSpecimen(stack, 4, 4 + 9);
+                return mergeItemStackToFilters(stack, 4, 4 + 9);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java
index 0f7ff359b..ff5beaa1b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerExternalStorage.java
@@ -22,7 +22,7 @@ public class ContainerExternalStorage extends ContainerBase {
         Slot slot = getSlot(index);
 
         if (slot.getHasStack() && index >= 8) {
-            return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
+            return mergeItemStackToFilters(slot.getStack(), 0, 9);
         }
 
         return ItemStack.EMPTY;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java
index 316dea078..412cbfd67 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java
@@ -35,7 +35,7 @@ public class ContainerFluidInterface extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4 + 1, false)) {
-                return mergeItemStackToSpecimen(stack, 5, 6);
+                return mergeItemStackToFilters(stack, 5, 6);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java
index e4519edad..afd40fed9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidStorage.java
@@ -22,7 +22,7 @@ public class ContainerFluidStorage extends ContainerBase {
         Slot slot = getSlot(index);
 
         if (slot.getHasStack() && index >= 8) {
-            return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
+            return mergeItemStackToFilters(slot.getStack(), 0, 9);
         }
 
         return ItemStack.EMPTY;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
index c1f433bc8..b72e71c57 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGridFilter.java
@@ -37,7 +37,7 @@ public class ContainerGridFilter extends ContainerBase {
             stack = slot.getStack();
 
             if (index > 9 - 1) {
-                return mergeItemStackToSpecimen(stack, 0, 9);
+                return mergeItemStackToFilters(stack, 0, 9);
             }
 
             return ItemStack.EMPTY;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java
index 95597d54e..67c3ef006 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerImporter.java
@@ -36,7 +36,7 @@ public class ContainerImporter extends ContainerBase {
                     return ItemStack.EMPTY;
                 }
             } else if (!mergeItemStack(stack, 0, 4, false)) {
-                return mergeItemStackToSpecimen(stack, 4, 4 + 9);
+                return mergeItemStackToFilters(stack, 4, 4 + 9);
             }
 
             if (stack.getCount() == 0) {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java
index 05209bbe1..98ca7c389 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerStorage.java
@@ -22,7 +22,7 @@ public class ContainerStorage extends ContainerBase {
         Slot slot = getSlot(index);
 
         if (slot.getHasStack() && index >= 8) {
-            return mergeItemStackToSpecimen(slot.getStack(), 0, 9);
+            return mergeItemStackToFilters(slot.getStack(), 0, 9);
         }
 
         return ItemStack.EMPTY;
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
index c02bd90eb..4ea1308b5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
@@ -330,7 +330,7 @@ public class TileConstructor extends TileNode implements IComparable, IType {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) upgrades;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
index 5d0204d3c..328fba1bc 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java
@@ -214,7 +214,7 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != getDirection()) {
-            return (T) patterns;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(patterns);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
index 10401a8c8..2338d3f49 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java
@@ -297,7 +297,7 @@ public class TileDestructor extends TileNode implements IComparable, IFilterable
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) upgrades;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
index fcfbdaf96..1f5dcdea7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java
@@ -573,7 +573,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) disks;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(disks);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
index 4b0320417..1c8ed949b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java
@@ -602,7 +602,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return facing == EnumFacing.DOWN ? (T) outputDisks : (T) inputDisks;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? outputDisks : inputDisks);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
index b8d35c1a0..a582644ab 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
@@ -191,7 +191,7 @@ public class TileExporter extends TileNode implements IComparable, IType {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) upgrades;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
index ef7c147f6..f6056feb7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java
@@ -240,7 +240,7 @@ public class TileFluidInterface extends TileNode implements IComparable {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) {
-            return facing == EnumFacing.DOWN ? (T) tankOut : (T) tankIn;
+            return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? tankOut : tankIn);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java
index b9d2470c9..63483dbc5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java
@@ -209,7 +209,7 @@ public class TileImporter extends TileNode implements IComparable, IFilterable,
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) upgrades;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
index 9500a5da6..43f68501a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java
@@ -193,7 +193,7 @@ public class TileInterface extends TileNode implements IComparable {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return facing == EnumFacing.DOWN ? (T) exportItems : (T) importItems;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? exportItems : importItems);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java
index 2b145d347..75f33af6f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java
@@ -129,7 +129,7 @@ public class TileProcessingPatternEncoder extends TileBase {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) patterns;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(patterns);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
index 08f8d6d47..42c93c92f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java
@@ -200,7 +200,7 @@ public class TileSolderer extends TileNode {
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return facing == EnumFacing.DOWN ? (T) result : (T) items;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? result : items);
         }
 
         return super.getCapability(capability, facing);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
index c83cbd90a..f19f342e3 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java
@@ -94,7 +94,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
     @Override
     public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing) {
         if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
-            return (T) upgrades;
+            return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(upgrades);
         }
 
         return super.getCapability(capability, facing);