diff --git a/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java
index 7e6c34119..d587e6af7 100644
--- a/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java
+++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java
@@ -81,7 +81,6 @@ public class TeamEvent {
             return this;
         }
 
-
         private IslandBaseEvent getEvent() {
             return switch (reason) {
             case JOIN -> new TeamJoinEvent(island, player, admin, location);
diff --git a/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java b/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
index 56034674d..7721746b0 100644
--- a/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
+++ b/src/main/java/world/bentobox/bentobox/api/panels/reader/TemplateReader.java
@@ -337,7 +337,6 @@ public class TemplateReader
                                             actionDataSection.getString("type"),
                                             actionDataSection.getString("content"),
                                             actionDataSection.getString("tooltip"));
-
                             itemRecord.addAction(actionData);
                         }
                     }
diff --git a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
index 4b97192f3..7a0931f04 100644
--- a/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
+++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
@@ -1183,6 +1183,8 @@ public class IslandsManager {
             // Set the game mode
             user.setGameMode(plugin.getIWM().getDefaultGameMode(world));
         }
+        // Remove from mid-teleport set
+        goingHome.remove(user.getUniqueId());
     }
 
     /**