diff --git a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java
index b78b1303cf..af00e740bc 100644
--- a/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java
+++ b/src/main/java/crazypants/enderio/item/darksteel/IDarkSteelItem.java
@@ -4,7 +4,7 @@ public interface IDarkSteelItem {
 
   int getIngotsRequiredForFullRepair();
 
-  public interface IEndSteelItem extends IDarkSteelItem{
+  public interface IEndSteelItem extends IDarkSteelItem {
 
   }
 
diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java
index 68c59c1c49..576b9c697b 100644
--- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java
+++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java
@@ -293,7 +293,7 @@ public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player) {
   @Override
   @Method(modid = "Thaumcraft")
   public int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect) {
-    if(stack == null || stack.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
+    if(stack == null || !DarkSteelItems.isArmorPart(stack.getItem(), 0)) {
       return 0;
     }
     return GogglesOfRevealingUpgrade.isUpgradeEquipped(player) ? 5 : 0;
@@ -318,7 +318,7 @@ public boolean protectPlayer(EntityPlayer player, ItemStack armor, String cause,
   @Override
   @Method(modid = "Forestry")
   public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) {
-    if(armor == null || armor.getItem() != DarkSteelItems.itemDarkSteelHelmet) {
+    if(armor == null ||  DarkSteelItems.isArmorPart(armor.getItem(), 0)) {
       return false;
     }
     return NaturalistEyeUpgrade.isUpgradeEquipped(player);
diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java
index 2dd938d9f2..d1cd1214cf 100644
--- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java
+++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/ApiaristArmorUpgrade.java
@@ -67,7 +67,7 @@ public boolean canAddToItem(ItemStack stack) {
 
   @Override
   public boolean hasUpgrade(ItemStack stack) {
-    return super.hasUpgrade(stack) && stack.getItem() instanceof ItemDarkSteelArmor;
+    return super.hasUpgrade(stack) && DarkSteelItems.isArmorPart(stack.getItem(), slot);
   }
 
   @Override