diff --git a/client/render/blocks/RenderBlockController.java b/client/render/blocks/RenderBlockController.java
index 15717a361..d1b30d5db 100644
--- a/client/render/blocks/RenderBlockController.java
+++ b/client/render/blocks/RenderBlockController.java
@@ -2,6 +2,7 @@ package appeng.client.render.blocks;
 
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockAccess;
 import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
@@ -19,9 +20,9 @@ public class RenderBlockController extends BaseBlockRender
 	public boolean renderInWorld(AEBaseBlock blk, IBlockAccess world, int x, int y, int z, RenderBlocks renderer)
 	{
 
-		boolean xx = world.getTileEntity( x - 1, y, z ) instanceof TileController && world.getTileEntity( x + 1, y, z ) instanceof TileController;
-		boolean yy = world.getTileEntity( x, y - 1, z ) instanceof TileController && world.getTileEntity( x, y + 1, z ) instanceof TileController;
-		boolean zz = world.getTileEntity( x, y, z - 1 ) instanceof TileController && world.getTileEntity( x, y, z + 1 ) instanceof TileController;
+		boolean xx = getTileEntity( world, x - 1, y, z ) instanceof TileController && getTileEntity( world, x + 1, y, z ) instanceof TileController;
+		boolean yy = getTileEntity( world, x, y - 1, z ) instanceof TileController && getTileEntity( world, x, y + 1, z ) instanceof TileController;
+		boolean zz = getTileEntity( world, x, y, z - 1 ) instanceof TileController && getTileEntity( world, x, y, z + 1 ) instanceof TileController;
 
 		int meta = world.getBlockMetadata( x, y, z );
 		boolean hasPower = meta > 0;
@@ -122,4 +123,11 @@ public class RenderBlockController extends BaseBlockRender
 		renderer.uvRotateEast = renderer.uvRotateBottom = renderer.uvRotateNorth = renderer.uvRotateSouth = renderer.uvRotateTop = renderer.uvRotateWest = 0;
 		return out;
 	}
+
+	private TileEntity getTileEntity(IBlockAccess world, int x, int y, int z)
+	{
+		if ( y >= 0 )
+			return world.getTileEntity( x, y, z );
+		return null;
+	}
 }
diff --git a/fmp/CableBusPart.java b/fmp/CableBusPart.java
index 76478e8ed..a4a6af0fe 100644
--- a/fmp/CableBusPart.java
+++ b/fmp/CableBusPart.java
@@ -428,7 +428,6 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
 	@Override
 	public void partChanged()
 	{
-		AELog.info( "rebuildSlotMap" );
 		if ( tile() instanceof TIInventoryTile )
 			((TIInventoryTile) tile()).rebuildSlotMap();
 
@@ -485,11 +484,6 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
 		cb.onInputsChanged( world, x, y, z, side, inputValues );
 	}
 
-	public void markDirty()
-	{
-		markForSave();
-	}
-
 	@Override
 	public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue)
 	{
diff --git a/parts/automation/PartImportBus.java b/parts/automation/PartImportBus.java
index 05e18b558..fbff58f9c 100644
--- a/parts/automation/PartImportBus.java
+++ b/parts/automation/PartImportBus.java
@@ -124,8 +124,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I
 	@Override
 	public void getBoxes(IPartCollsionHelper bch)
 	{
-		bch.addBox( 6, 6, 11, 10, 10, 12 );
-		bch.addBox( 6, 6, 12, 10, 10, 13 );
+		bch.addBox( 6, 6, 11, 10, 10, 13 );
 		bch.addBox( 5, 5, 13, 11, 11, 14 );
 		bch.addBox( 4, 4, 14, 12, 12, 16 );
 	}
diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java
index e0c926646..178a5c7fa 100644
--- a/parts/misc/PartInterface.java
+++ b/parts/misc/PartInterface.java
@@ -110,10 +110,8 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
 	@Override
 	public void getBoxes(IPartCollsionHelper bch)
 	{
-		bch.addBox( 3, 3, 15, 13, 13, 16 );
-		bch.addBox( 2, 2, 14, 14, 14, 15 );
-		bch.addBox( 5, 5, 12, 11, 11, 13 );
-		bch.addBox( 5, 5, 13, 11, 11, 14 );
+		bch.addBox( 2, 2, 14, 14, 14, 16 );
+		bch.addBox( 5, 5, 12, 11, 11, 14 );
 	}
 
 	@Override
diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java
index 09a1d247b..93a4abb14 100644
--- a/parts/misc/PartStorageBus.java
+++ b/parts/misc/PartStorageBus.java
@@ -328,8 +328,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
 	{
 		bch.addBox( 3, 3, 15, 13, 13, 16 );
 		bch.addBox( 2, 2, 14, 14, 14, 15 );
-		bch.addBox( 5, 5, 12, 11, 11, 13 );
-		bch.addBox( 5, 5, 13, 11, 11, 14 );
+		bch.addBox( 5, 5, 12, 11, 11, 14 );
 	}
 
 	@Override
diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java
index 8500d4365..ac3c370aa 100644
--- a/parts/p2p/PartP2PTunnel.java
+++ b/parts/p2p/PartP2PTunnel.java
@@ -332,6 +332,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 	@Override
 	public void getBoxes(IPartCollsionHelper bch)
 	{
+		bch.addBox( 5, 5, 12, 11, 11, 13 );
+		bch.addBox( 3, 3, 13, 13, 13, 14 );
 		bch.addBox( 2, 2, 14, 14, 14, 16 );
 	}