diff --git a/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala b/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
index 0e2e8ddb2..bdb244e21 100644
--- a/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
+++ b/src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
@@ -1,7 +1,7 @@
 package li.cil.oc.common.event
 
 import li.cil.oc.api.event.RobotPlaceInAirEvent
-import li.cil.oc.api.network.Component
+import li.cil.oc.api.network.Node
 import li.cil.oc.server.component.UpgradeAngel
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
@@ -12,8 +12,8 @@ object AngelUpgradeHandler {
   def onPlaceInAir(e: RobotPlaceInAirEvent) {
     val machineNode = e.agent.machine.node
     e.setAllowed(machineNode.reachableNodes.exists {
-      case component: Component if component.canBeSeenFrom(machineNode) =>
-        component.host.isInstanceOf[UpgradeAngel]
+      case node: Node if node.canBeReachedFrom(machineNode) =>
+        node.host.isInstanceOf[UpgradeAngel]
       case _ => false
     })
   }
diff --git a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
index 260c8a3af..2414408cd 100644
--- a/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
+++ b/src/main/scala/li/cil/oc/common/tileentity/Robot.scala
@@ -275,7 +275,7 @@ class Robot extends traits.Computer with traits.PowerInformation with traits.Rot
       else {
         getWorld.setBlockToAir(newPosition)
       }
-      created && BlockPosition(this) == newPosition
+      created && this.position == newPosition
     }
     finally {
       blockRobotProxy.moving.set(None)