diff --git a/src/main/resources/assets/opencomputers/lang/en_US.lang b/src/main/resources/assets/opencomputers/lang/en_US.lang
index b30fc9db6..ed18cca43 100644
--- a/src/main/resources/assets/opencomputers/lang/en_US.lang
+++ b/src/main/resources/assets/opencomputers/lang/en_US.lang
@@ -124,6 +124,9 @@ item.oc.UpgradeTankController.name=Tank Controller Upgrade
 item.oc.UpgradeTractorBeam.name=Tractor Beam Upgrade
 item.oc.WirelessNetworkCard.name=Wireless Network Card
 
+# Entities
+entity.oc.Drone.name=Drone
+
 # GUI
 oc:gui.Analyzer.Address=§6Address§f: %s
 oc:gui.Analyzer.AddressCopied=Address copied to clipboard.
diff --git a/src/main/scala/li/cil/oc/common/entity/Drone.scala b/src/main/scala/li/cil/oc/common/entity/Drone.scala
index 345751f05..72631d1cd 100644
--- a/src/main/scala/li/cil/oc/common/entity/Drone.scala
+++ b/src/main/scala/li/cil/oc/common/entity/Drone.scala
@@ -434,6 +434,8 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
 
   // ----------------------------------------------------------------------- //
 
+  override def getCommandSenderName = Localization.localizeImmediately("entity.oc.Drone.name")
+
   override def handleWaterMovement() = {
     inWater = worldObj.handleMaterialAcceleration(boundingBox, Material.water, this)
     inWater
diff --git a/src/main/scala/li/cil/oc/common/item/Analyzer.scala b/src/main/scala/li/cil/oc/common/item/Analyzer.scala
index d860edeec..89b4e5df4 100644
--- a/src/main/scala/li/cil/oc/common/item/Analyzer.scala
+++ b/src/main/scala/li/cil/oc/common/item/Analyzer.scala
@@ -22,8 +22,10 @@ object Analyzer {
     val player = e.entityPlayer
     val held = player.getHeldItem
     if (api.Items.get(held) == analyzer) {
-      if (analyze(e.target, player, 0, 0, 0, 0))
+      if (analyze(e.target, player, 0, 0, 0, 0)) {
+        player.swingItem()
         e.setCanceled(true)
+      }
     }
   }