diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
index 5f0e4f459..7f7a1b41f 100644
--- a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1102,7 +1102,7 @@ public void horse(CommandContext args, CommandSender sender, NPC npc,
             Messaging.sendTr(sender, Messages.HORSE_DESCRIBE, Util.prettyEnum(horse.getColor()), Util.prettyEnum(type),
                     Util.prettyEnum(horse.getStyle()));
         } else {
-            sender.sendMessage(output);
+            Messaging.send(sender, output);
         }
     }
 
diff --git a/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java b/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java
index 5c82c0e85..260fcf98c 100644
--- a/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java
+++ b/main/src/main/java/net/citizensnpcs/npc/ai/speech/CitizensSpeechFactory.java
@@ -85,5 +85,4 @@ public void register(Class<? extends VocalChord> clazz, String name) {
             throw new IllegalArgumentException("vocalchord name already registered");
         registered.put(name.toLowerCase(), clazz);
     }
-
 }
diff --git a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java
index 5d018d366..fd14b7206 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ShopTrait.java
@@ -39,6 +39,7 @@
 import net.citizensnpcs.api.trait.TraitName;
 import net.citizensnpcs.api.util.Colorizer;
 import net.citizensnpcs.api.util.DataKey;
+import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.api.util.Placeholders;
 import net.citizensnpcs.trait.shop.ItemAction;
 import net.citizensnpcs.trait.shop.ItemAction.ItemActionGUI;
@@ -100,7 +101,7 @@ public void display(Player sender) {
             if (viewPermission != null && !sender.hasPermission(viewPermission))
                 return;
             if (pages.size() == 0) {
-                sender.sendMessage(ChatColor.RED + "Empty shop");
+                Messaging.send(sender, "<red>Empty shop");
                 return;
             }
             InventoryMenu.createSelfRegistered(new NPCShopViewer(this, sender)).present(sender);
diff --git a/main/src/main/java/net/citizensnpcs/trait/SitTrait.java b/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
index 40ad0a7d1..aabde70b3 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SitTrait.java
@@ -55,7 +55,9 @@ public void run() {
             NMS.mount(holder.getEntity(), npc.getEntity());
         }
 
-        holder.teleport(sittingAt, TeleportCause.PLUGIN);
+        if (holder.getStoredLocation() != null && holder.getStoredLocation().distance(sittingAt) > 0.05) {
+            holder.teleport(sittingAt, TeleportCause.PLUGIN);
+        }
     }
 
     public void setSitting(Location at) {