diff --git a/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java b/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
index 6b0dcc7..4ddf443 100644
--- a/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
+++ b/api/src/main/java/net/momirealms/customnameplates/api/CustomNameplatesAPI.java
@@ -110,7 +110,7 @@ public record CustomNameplatesAPI(CustomNameplates plugin) {
             text = AdventureHelper.legacyToMiniMessage(text);
         }
         float advance = plugin.getAdvanceManager().getLineAdvance(text);
-        return adaptiveImage.createImagePrefix(advance, leftMargin, rightMargin) + text + adaptiveImage.createImageSuffix(advance, leftMargin, rightMargin);
+        return AdventureHelper.surroundWithNameplatesFont(adaptiveImage.createImagePrefix(advance, leftMargin, rightMargin)) + text + AdventureHelper.surroundWithNameplatesFont(adaptiveImage.createImageSuffix(advance, leftMargin, rightMargin));
     }
 
     /**
diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
index 64cddef..84368f4 100644
--- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
+++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/BukkitCustomNameplates.java
@@ -61,6 +61,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.*;
@@ -359,7 +360,7 @@ public class BukkitCustomNameplates extends CustomNameplates implements Listener
         return instance;
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onJoin(PlayerJoinEvent event) {
         Player player = event.getPlayer();
         handleJoin(player);
@@ -385,7 +386,7 @@ public class BukkitCustomNameplates extends CustomNameplates implements Listener
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onQuit(PlayerQuitEvent event) {
         Player player = event.getPlayer();
         CNPlayer cnPlayer = onlinePlayerMap.remove(player.getUniqueId());
diff --git a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/EntityDataValue.java b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/EntityDataValue.java
index 5db99f6..5da8e8e 100644
--- a/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/EntityDataValue.java
+++ b/platforms/bukkit/src/main/java/net/momirealms/customnameplates/bukkit/util/EntityDataValue.java
@@ -112,7 +112,7 @@ public class EntityDataValue {
 
     public static Object create(int id, Object serializer, Object value) {
         try {
-            Object entityDataAccessor =Reflections.constructor$EntityDataAccessor.newInstance(id, serializer);
+            Object entityDataAccessor = Reflections.constructor$EntityDataAccessor.newInstance(id, serializer);
             return Reflections.method$SynchedEntityData$DataValue$create.invoke(null, entityDataAccessor, value);
         } catch (ReflectiveOperationException e) {
             throw new RuntimeException(e);