diff --git a/src/main/java/net/md_5/bungee/EntityMap.java b/src/main/java/net/md_5/bungee/EntityMap.java
index 4bed2bcfe..3a7fda36e 100644
--- a/src/main/java/net/md_5/bungee/EntityMap.java
+++ b/src/main/java/net/md_5/bungee/EntityMap.java
@@ -54,6 +54,10 @@ public class EntityMap
         {
             1
         };
+        entityIds[0x1A] = new int[]
+        {
+            1
+        };
         entityIds[0x1C] = new int[]
         {
             1
@@ -78,6 +82,10 @@ public class EntityMap
         {
             1
         };
+        entityIds[0x23] = new int[]
+        {
+            1
+        };
         entityIds[0x26] = new int[]
         {
             1
@@ -98,6 +106,11 @@ public class EntityMap
         {
             1
         };
+        entityIds[0x37] = new int[]
+        {
+            1
+        };
+
         entityIds[0x47] = new int[]
         {
             1
diff --git a/src/main/java/net/md_5/bungee/command/CommandList.java b/src/main/java/net/md_5/bungee/command/CommandList.java
index 52cc1d23c..42584a4db 100644
--- a/src/main/java/net/md_5/bungee/command/CommandList.java
+++ b/src/main/java/net/md_5/bungee/command/CommandList.java
@@ -17,7 +17,7 @@ public class CommandList extends Command
         StringBuilder users = new StringBuilder();
         Collection<UserConnection> connections = BungeeCord.instance.connections.values();
 
-        if (connections.size() == 0)
+        if (connections.isEmpty())
         {
             sender.sendMessage(ChatColor.BLUE + "Currently no players online.");
             return;