diff --git a/Bosses.py b/Bosses.py
index 4c748391..ea02b8ba 100644
--- a/Bosses.py
+++ b/Bosses.py
@@ -183,6 +183,10 @@ def place_bosses(world, player):
                 raise FillError('Could not place boss for location %s' % loc_text)
             bosses.remove(boss)
 
+            # GT Bosses can move dungeon - find the real dungeon to place them in
+            if level:
+                loc = [x.name for x in world.dungeons if x.player == player and level in x.bosses.keys()][0]
+                loc_text = loc + ' (' + level + ')'
             logging.getLogger('').debug('Placing boss %s at %s', boss, loc_text)
             world.get_dungeon(loc, player).bosses[level] = BossFactory(boss, player)
     elif world.boss_shuffle[player] == "chaos": #all bosses chosen at random
@@ -193,5 +197,9 @@ def place_bosses(world, player):
             except IndexError:
                 raise FillError('Could not place boss for location %s' % loc_text)
 
+            # GT Bosses can move dungeon - find the real dungeon to place them in
+            if level:
+                loc = [x.name for x in world.dungeons if x.player == player and level in x.bosses.keys()][0]
+                loc_text = loc + ' (' + level + ')'
             logging.getLogger('').debug('Placing boss %s at %s', boss, loc_text)
             world.get_dungeon(loc, player).bosses[level] = BossFactory(boss, player)
diff --git a/EntranceShuffle.py b/EntranceShuffle.py
index e1813011..c4747374 100644
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -2298,8 +2298,6 @@ Bomb_Shop_Multi_Cave_Doors = ['Hyrule Castle Entrance (South)',
                               'Death Mountain Return Cave (East)',
                               'Death Mountain Return Cave (West)',
                               'Spectacle Rock Cave Peak',
-                              'Spectacle Rock Cave',
-                              'Spectacle Rock Cave (Bottom)',
                               'Paradox Cave (Bottom)',
                               'Paradox Cave (Middle)',
                               'Paradox Cave (Top)',
diff --git a/Rules.py b/Rules.py
index c243ce2d..291eb11e 100644
--- a/Rules.py
+++ b/Rules.py
@@ -1185,14 +1185,13 @@ def set_inverted_big_bomb_rules(world, player):
                            'Hyrule Castle Entrance (East)',
                            'Inverted Ganons Tower',
                            'Cave 45',
-                           'Checkerboard Cave']
+                           'Checkerboard Cave',
+                           'Inverted Big Bomb Shop']
     LW_DM_entrances = ['Old Man Cave (East)',
                        'Old Man House (Bottom)',
                        'Old Man House (Top)',
                        'Death Mountain Return Cave (East)',
                        'Spectacle Rock Cave Peak',
-                       'Spectacle Rock Cave',
-                       'Spectacle Rock Cave (Bottom)',
                        'Tower of Hera',
                        'Death Mountain Return Cave (West)',
                        'Paradox Cave (Top)',
@@ -1212,7 +1211,7 @@ def set_inverted_big_bomb_rules(world, player):
                              'Chest Game',
                              'Dark World Hammer Peg Cave',
                              'Red Shield Shop',
-                             'Dark Sanctuary Hint',
+                             'Inverted Dark Sanctuary',
                              'Fortune Teller (Dark)',
                              'Dark World Shop',
                              'Dark World Lumberjack Shop',
@@ -1222,7 +1221,7 @@ def set_inverted_big_bomb_rules(world, player):
     Southern_DW_entrances = ['Hype Cave',
                              'Bonk Fairy (Dark)',
                              'Archery Game',
-                             'Inverted Big Bomb Shop',
+                             'Inverted Links House',
                              'Dark Lake Hylia Shop',
                              'Swamp Palace']
     Isolated_DW_entrances = ['Spike Cave',