diff --git a/src/main/scala/li/cil/oc/common/block/Cable.scala b/src/main/scala/li/cil/oc/common/block/Cable.scala
index b879f8e9f..3eb55e22b 100644
--- a/src/main/scala/li/cil/oc/common/block/Cable.scala
+++ b/src/main/scala/li/cil/oc/common/block/Cable.scala
@@ -60,8 +60,8 @@ class Cable(protected implicit val tileTag: ClassTag[tileentity.Cable]) extends
 
   override def getBoundingBox(state: IBlockState, world: IBlockAccess, pos: BlockPos): AxisAlignedBB = Cable.bounds(world, pos)
 
-  override def addCollisionBoxToList(state : IBlockState, world : World, pos : BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB], entity : Entity) = {
-    Cable.parts(world, pos, entityBox, boxes)
+  override def addCollisionBoxToList(state: IBlockState, worldIn: World, pos: BlockPos, entityBox: AxisAlignedBB, collidingBoxes: util.List[AxisAlignedBB], entityIn: Entity, isActualState: Boolean): Unit = {
+    Cable.parts(worldIn, pos, entityBox, collidingBoxes)
   }
 
   // ----------------------------------------------------------------------- //
@@ -144,13 +144,13 @@ object Cable {
 
   def parts(world: IBlockAccess, pos: BlockPos, entityBox : AxisAlignedBB, boxes : util.List[AxisAlignedBB]) = {
     val center = Cable.DefaultBounds.offset(pos)
-    if (entityBox.intersectsWith(center)) boxes.add(center)
+    if (entityBox.intersects(center)) boxes.add(center)
 
     val mask = Cable.neighbors(world, pos)
     for (side <- EnumFacing.VALUES) {
       if(((1 << side.getIndex) & mask) != 0) {
         val part = Cable.CachedParts(side.ordinal()).offset(pos)
-        if (entityBox.intersectsWith(part)) boxes.add(part)
+        if (entityBox.intersects(part)) boxes.add(part)
       }
     }
   }
diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
index 185dbdd30..5a59f9df6 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
@@ -52,7 +52,7 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends Abs
       copyItemsFromHost()
       var countCrafted = 0
       val initialCraft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world)
-      if (initialCraft != null && !initialCraft.isEmpty) {
+      if (initialCraft != null) {
         def tryCraft() : Boolean = {
           val craft = CraftingManager.findMatchingRecipe(CraftingInventory, host.world)
           if (craft == null || craft != initialCraft) {