diff --git a/Fill.py b/Fill.py
index b887c3aa..b45ded74 100644
--- a/Fill.py
+++ b/Fill.py
@@ -178,6 +178,9 @@ def distribute_items_restrictive(world, gftower_trash=False, fill_locations=None
     unplaced = [item for item in progitempool + prioitempool + restitempool]
     unfilled = [location.name for location in fill_locations]
 
+    for location in fill_locations:
+        world.push_item(location, ItemFactory('Nothing', location.player), False)
+
     if unplaced or unfilled:
         logging.warning('Unplaced items: %s - Unfilled Locations: %s', unplaced, unfilled)
 
diff --git a/Rules.py b/Rules.py
index 99d1c6a1..a5c75a51 100644
--- a/Rules.py
+++ b/Rules.py
@@ -861,7 +861,7 @@ def standard_rules(world, player):
 def toss_junk_item(world, player):
     items = ['Rupees (20)', 'Bombs (3)', 'Arrows (10)', 'Rupees (5)', 'Rupee (1)', 'Bombs (10)',
              'Single Arrow', 'Rupees (50)', 'Rupees (100)', 'Single Bomb', 'Bee', 'Bee Trap',
-             'Rupees (300)']
+             'Rupees (300)', 'Nothing']
     for item in items:
         big20 = next((i for i in world.itempool if i.name == item and i.player == player), None)
         if big20:
@@ -940,7 +940,7 @@ def set_trock_key_rules(world, player):
             if not can_reach_big_chest:
                 # Must not go in the Chain Chomps chest - only 2 other chests available and 3+ keys required for all other chests
                 forbid_item(world.get_location('Turtle Rock - Chain Chomps', player), 'Big Key (Turtle Rock)', player)
-            if world.accessibility[player] == 'locations':
+            if world.accessibility[player] == 'locations' and world.goal[player] != 'icerodhunt':
                 if world.bigkeyshuffle[player] and can_reach_big_chest:
                     # Must not go in the dungeon - all 3 available chests (Chomps, Big Chest, Crystaroller) must be keys to access laser bridge, and the big key is required first
                     for location in ['Turtle Rock - Chain Chomps', 'Turtle Rock - Compass Chest',
diff --git a/Shops.py b/Shops.py
index 0e94d057..7c31fc77 100644
--- a/Shops.py
+++ b/Shops.py
@@ -254,7 +254,10 @@ def create_shops(world, player: int):
                 loc.shop_slot = True
                 loc.locked = True
                 if single_purchase_slots.pop():
-                    additional_item = 'Rupees (50)'  # world.random.choice(['Rupees (50)', 'Rupees (100)', 'Rupees (300)'])
+                    if world.goal[player] != 'icerodhunt':
+                        additional_item = 'Rupees (50)'  # world.random.choice(['Rupees (50)', 'Rupees (100)', 'Rupees (300)'])
+                    else:
+                        additional_item = 'Nothing'
                     loc.item = ItemFactory(additional_item, player)
                 else:
                     loc.item = ItemFactory('Nothing', player)