diff --git a/dGame/EntityManager.cpp b/dGame/EntityManager.cpp
index 96a2328..db60a1d 100644
--- a/dGame/EntityManager.cpp
+++ b/dGame/EntityManager.cpp
@@ -226,7 +226,7 @@ void EntityManager::UpdateEntities(const float deltaTime) {
 
 		const auto& ghostingToDelete = std::find(m_EntitiesToGhost.begin(), m_EntitiesToGhost.end(), entityToDelete);
 
-		if (entityToDelete != nullptr)
+		if (entityToDelete)
 		{
 			// If we are a player run through the player destructor.
 			if (entityToDelete->IsPlayer())
diff --git a/dScripts/NjMonastryBossInstance.cpp b/dScripts/NjMonastryBossInstance.cpp
index c6c8e32..27de743 100644
--- a/dScripts/NjMonastryBossInstance.cpp
+++ b/dScripts/NjMonastryBossInstance.cpp
@@ -91,9 +91,27 @@ void NjMonastryBossInstance::OnPlayerLoaded(Entity *self, Entity *player) {
 
 void NjMonastryBossInstance::OnPlayerExit(Entity *self, Entity *player) {
     UpdatePlayer(self, player->GetObjectID(), true);
-    //TODO: Add functionality to dynamically turn off the large team variable when enough players leave.
-    GameMessages::SendNotifyClientObject(self->GetObjectID(), u"PlayerLeft", 0, 0,
-                                         player->GetObjectID(), "", UNASSIGNED_SYSTEM_ADDRESS);
+    // Fetch the total players loaded from the vars
+    auto totalPlayersLoaded = self->GetVar<std::vector<LWOOBJID> >(TotalPlayersLoadedVariable);
+    
+    // Find the player to remove
+    auto playerToRemove = std::find(totalPlayersLoaded.begin(), totalPlayersLoaded.end(), player->GetObjectID());
+
+    // If we found the player remove them from out list of players
+    if (playerToRemove != totalPlayersLoaded.end()) {
+        totalPlayersLoaded.erase(playerToRemove);
+    } else {
+        Game::logger->Log("NjMonastryBossInstance", "Failed to remove player at exit.\n");
+    }
+
+    // Set the players loaded var back
+    self->SetVar<std::vector<LWOOBJID>>(TotalPlayersLoadedVariable, totalPlayersLoaded);
+
+    // Since this is an exit method, check if enough players have left.  If enough have left
+    // resize the instance to account for such.
+    if (totalPlayersLoaded.size() <= 2) self->SetVar<bool>(LargeTeamVariable, false);
+
+    GameMessages::SendNotifyClientObject(self->GetObjectID(), u"PlayerLeft", 0, 0, player->GetObjectID(), "", UNASSIGNED_SYSTEM_ADDRESS);
 }
 
 void NjMonastryBossInstance::OnActivityTimerDone(Entity *self, const std::string &name) {
diff --git a/dScripts/SGCannon.cpp b/dScripts/SGCannon.cpp
index a5c2c84..3912364 100644
--- a/dScripts/SGCannon.cpp
+++ b/dScripts/SGCannon.cpp
@@ -144,8 +144,9 @@ void SGCannon::OnMessageBoxResponse(Entity *self, Entity *sender, int32_t button
     if (player != nullptr) {
         if (button == 1 && identifier == u"Shooting_Gallery_Stop")
         {
-            static_cast<Player*>(player)->SendToZone(1300);
-
+            UpdatePlayer(self, player->GetObjectID(), true);
+            RemovePlayer(player->GetObjectID());
+            StopGame(self, true);
             return;
         }