diff --git a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
index 29fe43d93..82a9f80fb 100644
--- a/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
+++ b/src/main/java/net/citizensnpcs/npc/ai/MCTargetStrategy.java
@@ -103,7 +103,7 @@ public class MCTargetStrategy implements PathStrategy, EntityTarget {
             } else if (handle instanceof EntityPlayer) {
                 EntityPlayer humanHandle = (EntityPlayer) handle;
                 humanHandle.attack(target);
-                PlayerAnimation.HURT.play(humanHandle.getBukkitEntity());
+                PlayerAnimation.ARM_SWING.play(humanHandle.getBukkitEntity());
             } else {
                 NMS.attack(handle, target);
             }
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java b/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
index 31c9843c2..0c7c9dfff 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/triggers/TriggerEditPrompt.java
@@ -56,7 +56,7 @@ public class TriggerEditPrompt extends StringPrompt {
         final Conversation conversation = new ConversationFactory(CitizensAPI.getPlugin())
                 .withLocalEcho(false).withEscapeSequence("exit").withEscapeSequence("/npc path")
                 .withModality(false).withFirstPrompt(new TriggerEditPrompt(editor)).buildConversation(player);
-        conversation.begin();
+        player.beginConversation(conversation);
         return conversation;
     }
 }
diff --git a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
index b91159981..22ce53786 100644
--- a/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
+++ b/src/main/java/net/citizensnpcs/util/PlayerAnimation.java
@@ -48,7 +48,7 @@ public enum PlayerAnimation {
                     radius);
         }
     },
-    SWING_ARM {
+    ARM_SWING {
         @Override
         protected void playAnimation(EntityPlayer player, int radius) {
             Packet18ArmAnimation packet = new Packet18ArmAnimation(player, 1);