diff --git a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index 2c0ca9bd..77d33031 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -111,8 +111,13 @@ public class DisguiseUtilities {
                 team.setOption(Option.NAME_TAG_VISIBILITY, nameVisible ? OptionStatus.ALWAYS : OptionStatus.NEVER);
             }
 
-            team.setPrefix(getPrefix());
-            team.setSuffix(getSuffix());
+            if (NmsVersion.v1_13.isSupported()) {
+                team.setPrefix("Colorize");
+                team.setSuffix("Colorize");
+            } else {
+                team.setPrefix(getPrefix());
+                team.setSuffix(getSuffix());
+            }
         }
     }
 
@@ -1601,7 +1606,7 @@ public class DisguiseUtilities {
             throw new IllegalStateException("This can only be used for names longer than 16 characters!");
         }
 
-        int limit = NmsVersion.v1_13.isSupported() ? 64 : 16;
+        int limit = NmsVersion.v1_13.isSupported() ? 1024 : 16;
 
         if (name.length() > (16 + (limit * 2))) {
             name = name.substring(0, (16 + (limit * 2)));
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
index c7f06a9e..d33d70fb 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java
@@ -169,7 +169,7 @@ public class PacketsManager {
             ProtocolLibrary.getProtocolManager().addPacketListener(mainListener);
             ProtocolLibrary.getProtocolManager().addPacketListener(destroyListener);
 
-            if (NmsVersion.v1_16.isSupported()) {
+            if (NmsVersion.v1_13.isSupported()) {
                 scoreboardTeamListener = new PacketListenerScoreboardTeam();
                 ProtocolLibrary.getProtocolManager().addPacketListener(scoreboardTeamListener);
             }
diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
index 4f5a1536..4ab43095 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java
@@ -13,7 +13,7 @@ import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.chat.ComponentSerializer;
-import org.bukkit.plugin.Plugin;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.Set;
 
@@ -30,7 +30,7 @@ public class PacketListenerScoreboardTeam extends PacketAdapter {
         PacketContainer packet = event.getPacket();
         String name = packet.getStrings().read(0);
 
-        if (!name.startsWith("LD_")) {
+        if (!name.startsWith("LD_") || name.equals("LD_NoName") || name.equals("LD_Pushing")) {
             return;
         }
 
@@ -53,6 +53,7 @@ public class PacketListenerScoreboardTeam extends PacketAdapter {
         }
 
         StructureModifier<WrappedChatComponent> chats = packet.getChatComponents();
+
         BaseComponent[] prefix = DisguiseUtilities.getColoredChat(team.getPrefix());
         BaseComponent[] suffix = DisguiseUtilities.getColoredChat(team.getSuffix());