diff --git a/integration/modules/BC.java b/integration/modules/BC.java
index d7571f163..79ba13d55 100644
--- a/integration/modules/BC.java
+++ b/integration/modules/BC.java
@@ -119,7 +119,14 @@ public class BC extends BaseModule implements IBC
 		if ( is == null )
 			return false;
 
-		return is.getItem() instanceof ItemFacade && ItemFacade.getType( is ) == ItemFacade.TYPE_BASIC;
+		try
+		{
+			return is.getItem() instanceof ItemFacade && ItemFacade.getType( is ) == ItemFacade.TYPE_BASIC;
+		}
+		catch (Throwable t)
+		{
+			return is.getItem() instanceof ItemFacade;
+		}
 	}
 
 	@Override
diff --git a/integration/modules/MJ6.java b/integration/modules/MJ6.java
index 7907b7aa7..e47c38ee7 100644
--- a/integration/modules/MJ6.java
+++ b/integration/modules/MJ6.java
@@ -3,6 +3,8 @@ package appeng.integration.modules;
 import appeng.integration.BaseModule;
 import appeng.integration.abstraction.IMJ6;
 import buildcraft.api.mj.IBatteryObject;
+import buildcraft.api.mj.IBatteryProvider;
+import buildcraft.api.mj.ISidedBatteryProvider;
 
 public class MJ6 extends BaseModule implements IMJ6
 {
@@ -11,6 +13,9 @@ public class MJ6 extends BaseModule implements IMJ6
 
 	public MJ6() {
 		TestClass( IBatteryObject.class );
+		TestClass( IBatteryProvider.class );
+		TestClass( ISidedBatteryProvider.class );
+		throw new RuntimeException( "Disabled For Now!" );
 	}
 
 	@Override
diff --git a/parts/p2p/PartP2PBCPower.java b/parts/p2p/PartP2PBCPower.java
index 6fb3b2eb5..bd80d4b76 100644
--- a/parts/p2p/PartP2PBCPower.java
+++ b/parts/p2p/PartP2PBCPower.java
@@ -34,7 +34,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 @InterfaceList(value = { @Interface(iface = "buildcraft.api.mj.ISidedBatteryProvider", iname = "MJ6"),
-		@Interface(iface = "buildcraft.api.power.IPowerReceptor", iname = "MJ5"),
+		@Interface(iface = "buildcraft.api.mj.IBatteryObject", iname = "MJ6"), @Interface(iface = "buildcraft.api.power.IPowerReceptor", iname = "MJ5"),
 		@Interface(iface = "appeng.api.networking.ticking.IGridTickable", iname = "MJ5") })
 public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPowerReceptor, ISidedBatteryProvider, IBatteryObject, IGridTickable
 {