diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index 9e846b603d..3e483e56e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -83,18 +83,25 @@ public final class CraftItemFactory implements ItemFactory {
             return meta instanceof CraftMetaEnchantedBook ? meta : new CraftMetaEnchantedBook(meta);
         case BANNER:
             return meta instanceof CraftMetaBanner ? meta : new CraftMetaBanner(meta);
-        case COMMAND:
+        case FURNACE:
         case CHEST:
         case TRAPPED_CHEST:
-        case FURNACE:
-        case HOPPER:
-        case MOB_SPAWNER:
-        case SIGN:
-        case BREWING_STAND_ITEM:
         case JUKEBOX:
-        case FLOWER_POT_ITEM:
         case DISPENSER:
         case DROPPER:
+        case SIGN:
+        case MOB_SPAWNER:
+        case NOTE_BLOCK:
+        case PISTON_BASE:
+        case BREWING_STAND_ITEM:
+        case ENCHANTMENT_TABLE:
+        case COMMAND:
+        case BEACON:
+        case DAYLIGHT_DETECTOR:
+        case DAYLIGHT_DETECTOR_INVERTED:
+        case HOPPER:
+        case REDSTONE_COMPARATOR:
+        case FLOWER_POT_ITEM:
             if (meta instanceof CraftMetaTileEntity) {
                 CraftMetaTileEntity te = (CraftMetaTileEntity) meta;
                 if (te.material != material) {
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c8dadb53bc..36cf8d0be5 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -347,18 +347,25 @@ public final class CraftItemStack extends ItemStack {
                 return new CraftMetaEnchantedBook(item.getTag());
             case BANNER:
                 return new CraftMetaBanner(item.getTag());
-            case COMMAND:
+            case FURNACE:
             case CHEST:
             case TRAPPED_CHEST:
-            case FURNACE:
-            case HOPPER:
-            case MOB_SPAWNER:
-            case SIGN:
-            case BREWING_STAND_ITEM:
             case JUKEBOX:
-            case FLOWER_POT_ITEM:
             case DISPENSER:
             case DROPPER:
+            case SIGN:
+            case MOB_SPAWNER:
+            case NOTE_BLOCK:
+            case PISTON_BASE:
+            case BREWING_STAND_ITEM:
+            case ENCHANTMENT_TABLE:
+            case COMMAND:
+            case BEACON:
+            case DAYLIGHT_DETECTOR:
+            case DAYLIGHT_DETECTOR_INVERTED:
+            case HOPPER:
+            case REDSTONE_COMPARATOR:
+            case FLOWER_POT_ITEM:
                 return new CraftMetaTileEntity(item.getTag(), CraftMagicNumbers.getMaterial(item.getItem()));                
             default:
                 return new CraftMetaItem(item.getTag());
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
index 919e869884..fc293741f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaTileEntity.java
@@ -97,19 +97,26 @@ public class CraftMetaTileEntity extends CraftMetaItem {
 
     @Override
     boolean applicableTo(Material type) {
-        switch(type){            
-            case COMMAND:
+        switch(type){         
+            case FURNACE:
             case CHEST:
             case TRAPPED_CHEST:
-            case FURNACE:
-            case HOPPER:
-            case MOB_SPAWNER:
-            case SIGN:
-            case BREWING_STAND_ITEM:
             case JUKEBOX:
-            case FLOWER_POT_ITEM:
             case DISPENSER:
             case DROPPER:
+            case SIGN:
+            case MOB_SPAWNER:
+            case NOTE_BLOCK:
+            case PISTON_BASE:
+            case BREWING_STAND_ITEM:
+            case ENCHANTMENT_TABLE:
+            case COMMAND:
+            case BEACON:
+            case DAYLIGHT_DETECTOR:
+            case DAYLIGHT_DETECTOR_INVERTED:
+            case HOPPER:
+            case REDSTONE_COMPARATOR:
+            case FLOWER_POT_ITEM:
                 return true;
         }
         return false;