diff --git a/worlds/witness/player_logic.py b/worlds/witness/player_logic.py
index cfd36c09be24..3d89058af1ac 100644
--- a/worlds/witness/player_logic.py
+++ b/worlds/witness/player_logic.py
@@ -371,7 +371,7 @@ def make_options_adjustments(self, world: "WitnessWorld"):
         if lasers:
             adjustment_linesets_in_order.append(get_laser_shuffle())
 
-        if world.options.shuffle_EPs:
+        if world.options.shuffle_EPs == "obelisk_sides":
             ep_gen = ((ep_hex, ep_obj) for (ep_hex, ep_obj) in self.REFERENCE_LOGIC.ENTITIES_BY_HEX.items()
                       if ep_obj["entityType"] == "EP")
 
@@ -485,7 +485,7 @@ def make_event_panel_lists(self):
         self.EVENT_NAMES_BY_HEX[self.VICTORY_LOCATION] = "Victory"
 
         for event_hex, event_name in self.EVENT_NAMES_BY_HEX.items():
-            if event_hex in self.COMPLETELY_DISABLED_ENTITIES:
+            if event_hex in self.COMPLETELY_DISABLED_ENTITIES or event_hex in self.IRRELEVANT_BUT_NOT_DISABLED_ENTITIES:
                 continue
             self.EVENT_PANELS.add(event_hex)
 
diff --git a/worlds/witness/regions.py b/worlds/witness/regions.py
index 2187010bac07..e09702480515 100644
--- a/worlds/witness/regions.py
+++ b/worlds/witness/regions.py
@@ -71,7 +71,7 @@ def connect_if_possible(self, world: "WitnessWorld", source: str, target: str, r
         source_region.exits.append(connection)
         connection.connect(target_region)
 
-        self.created_entrances[(source, target)].append(connection)
+        self.created_entrances[source, target].append(connection)
 
         # Register any necessary indirect connections
         mentioned_regions = {
diff --git a/worlds/witness/rules.py b/worlds/witness/rules.py
index 07fea23b14ba..75c662ac0f26 100644
--- a/worlds/witness/rules.py
+++ b/worlds/witness/rules.py
@@ -66,8 +66,8 @@ def _can_solve_panel(panel: str, world: "WitnessWorld", player: int, player_logi
 
 
 def _can_move_either_direction(state: CollectionState, source: str, target: str, regio: WitnessRegions) -> bool:
-    entrance_forward = regio.created_entrances[(source, target)]
-    entrance_backward = regio.created_entrances[(source, target)]
+    entrance_forward = regio.created_entrances[source, target]
+    entrance_backward = regio.created_entrances[target, source]
 
     return (
         any(entrance.can_reach(state) for entrance in entrance_forward)