diff --git a/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
index 500f1d2c7..c7c6c3908 100644
--- a/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
+++ b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
@@ -27,14 +27,19 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEnd(ChunkLoadEvent e) {
-        if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getWorld())
-                || !e.getWorld().getEnvironment().equals(Environment.THE_END)
-                || !plugin.getIWM().inWorld(e.getWorld())
+        if (!e.getWorld().getEnvironment().equals(Environment.THE_END)
+                || e.getChunk().getX() != 0
+				|| e.getChunk().getZ() != 0
+				|| !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getWorld())
+				|| !plugin.getIWM().inWorld(e.getWorld())
                 || !plugin.getIWM().isEndGenerate(e.getWorld())
                 || !plugin.getIWM().isEndIslands(e.getWorld())
-                || !(e.getChunk().getX() == 0 && e.getChunk().getZ() == 0)) {
+                || e.getChunk().getBlock(0, 255, 0).getType().equals(Material.END_PORTAL))
+        {
+            // No need to process.
             return;
         }
+
         // Setting a End Portal at the top will trick dragon legacy check.
         e.getChunk().getBlock(0, 255, 0).setType(Material.END_PORTAL);
     }
@@ -46,12 +51,12 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEndBlockPlace(BlockPlaceEvent e) {
-        if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
-                || e.getBlock().getY() != 255
+        if (e.getBlock().getY() != 255
                 || e.getBlock().getX() != 0
                 || e.getBlock().getZ() != 0
                 || !e.getBlock().getType().equals(Material.END_PORTAL)
                 || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
+                || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
                 || !plugin.getIWM().inWorld(e.getBlock().getWorld())
                 || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
                 || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {
@@ -67,12 +72,12 @@ public class BlockEndDragon implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEndBlockBreak(BlockBreakEvent e) {
-        if (!Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
-                || e.getBlock().getY() != 255
+        if (e.getBlock().getY() != 255
                 || e.getBlock().getX() != 0
                 || e.getBlock().getZ() != 0
                 || !e.getBlock().getType().equals(Material.END_PORTAL)
                 || !e.getBlock().getWorld().getEnvironment().equals(Environment.THE_END)
+                || !Flags.REMOVE_END_EXIT_ISLAND.isSetForWorld(e.getBlock().getWorld())
                 || !plugin.getIWM().inWorld(e.getBlock().getWorld())
                 || !plugin.getIWM().isEndGenerate(e.getBlock().getWorld())
                 || !plugin.getIWM().isEndIslands(e.getBlock().getWorld())) {
diff --git a/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java b/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
index 55549adc4..2dd5ff447 100644
--- a/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/BlueprintsManager.java
@@ -135,7 +135,7 @@ public class BlueprintsManager {
      * @param addon the {@link GameModeAddon} to get the blueprint bundles.
      */
     public Map<String, BlueprintBundle> getBlueprintBundles(@NonNull GameModeAddon addon) {
-        return blueprintBundles.getOrDefault(addon, new HashMap<>());
+        return blueprintBundles.getOrDefault(addon, new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
     }
 
     /**
@@ -153,7 +153,7 @@ public class BlueprintsManager {
      * @param addon the {@link GameModeAddon} to load the blueprints of.
      */
     public void loadBlueprintBundles(@NonNull GameModeAddon addon) {
-        blueprintBundles.put(addon, new HashMap<>());
+        blueprintBundles.put(addon, new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
 
         // See if there are any schems that need converting
         new SchemToBlueprint(plugin).convertSchems(addon);