diff --git a/Fill.py b/Fill.py
index 068b1c26..959b97b4 100644
--- a/Fill.py
+++ b/Fill.py
@@ -67,7 +67,7 @@ def fill_dungeons_restrictive(world, shuffled_locations):
 
     all_state_base = world.get_all_state()
     for player in range(1, world.players + 1):
-        if world.logic[player] == 'hybridglitches' and world.keyshuffle[i.player] in ['none', 'nearby'] \
+        if world.logic[player] == 'hybridglitches' and world.keyshuffle[player] in ['none', 'nearby'] \
                 and world.pottery[player] not in ['none', 'cave']:
             # remove 2 keys from main pool
             count_to_remove = 2
diff --git a/Main.py b/Main.py
index 1e64d179..361743cb 100644
--- a/Main.py
+++ b/Main.py
@@ -161,7 +161,7 @@ def main(args, seed=None, fish=None):
     if world.spoiler_mode != 'none' and not args.jsonout:
         logger.info(world.fish.translate("cli", "cli", "create.meta"))
         world.spoiler.meta_to_file(output_path(f'{outfilebase}_Spoiler.txt'))
-    if args.mystery and not (args.suppress_meta or args.spoiler != 'none'):
+    if args.mystery and not args.suppress_meta:
         world.spoiler.mystery_meta_to_file(output_path(f'{outfilebase}_meta.txt'))
 
     for player in range(1, world.players + 1):
@@ -361,7 +361,7 @@ def main(args, seed=None, fish=None):
                 with open(output_path('%s_multidata' % outfilebase), 'wb') as f:
                     f.write(multidata)
 
-    if args.mystery and not (args.suppress_meta or args.spoiler not in ['full']):
+    if args.mystery and not args.suppress_meta:
         world.spoiler.hashes_to_file(output_path(f'{outfilebase}_meta.txt'))
     elif world.spoiler_mode != 'none' and not args.jsonout:
         world.spoiler.hashes_to_file(output_path(f'{outfilebase}_Spoiler.txt'))
diff --git a/UnderworldGlitchRules.py b/UnderworldGlitchRules.py
index 24a92dd0..56e64f71 100644
--- a/UnderworldGlitchRules.py
+++ b/UnderworldGlitchRules.py
@@ -67,7 +67,7 @@ def connect_hmg_entrances_regions(world, player):
             connection.connect(target)
 
     # Add the new Ice path (back of bomb drop to front) to the world and model it properly
-    ip_clip_entrance = world.get_entrance('Ice Bomb Drop Clip', 1)
+    ip_clip_entrance = world.get_entrance('Ice Bomb Drop Clip', player)
     clip_door = Door(player, "Ice Bomb Drop Clip", DoorType.Logical, ip_clip_entrance)
     world.doors += [clip_door]
     world.initialize_doors([clip_door])