diff --git a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java
index 5196d8144..e000bed16 100644
--- a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java
+++ b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java
@@ -85,7 +85,10 @@ public final class WrappedDamageItemDefinition implements ITileDefinition
 			return false;
 		}
 
-		return this.definition.isSameAs( comparableStack ) && comparableStack.getItemDamage() == this.damage;
+		final boolean sameItem = this.definition.isSameAs( new ItemStack( comparableStack.getItem() ) );
+		final boolean sameDamage = comparableStack.getItemDamage() == this.damage;
+
+		return sameItem && sameDamage;
 	}
 
 	@Override
diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java
index 9bb4b7401..4f89468d9 100644
--- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java
+++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java
@@ -92,7 +92,7 @@ public final class DisassembleRecipe implements IRecipe
 			{
 				// needs a single input in the recipe
 				itemCount++;
-				if ( itemCount > 1 )
+				if( itemCount > 1 )
 				{
 					return MISMATCHED_STACK;
 				}
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index eb0497564..47c1f5a96 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -1863,15 +1863,15 @@ public class Platform
 		return null;
 	}
 
-	public static boolean isSameItemType( ItemStack ol, ItemStack op )
+	public static boolean isSameItemType( ItemStack that, ItemStack other )
 	{
-		if( ol != null && op != null && ol.getItem() == op.getItem() )
+		if( that != null && other != null && that.getItem() == other.getItem() )
 		{
-			if( ol.isItemStackDamageable() )
+			if( that.isItemStackDamageable() )
 			{
 				return true;
 			}
-			return ol.getItemDamage() == ol.getItemDamage();
+			return that.getItemDamage() == other.getItemDamage();
 		}
 		return false;
 	}