diff --git a/Mystery.py b/Mystery.py
index b73c3706..a546233e 100644
--- a/Mystery.py
+++ b/Mystery.py
@@ -212,8 +212,14 @@ def roll_settings(weights):
     inventoryweights = weights.get('startinventory', {})
     startitems = []
     for item in inventoryweights.keys():
+        itemvalue = get_choice(item, inventoryweights)
+        if item.startswith(('Progressive ', 'Small Key ', 'Rupee', 'Piece of Heart', 'Boss Heart Container', 'Sanctuary Heart Container', 'Arrow', 'Bombs ', 'Bomb ', 'Bottle')) and isinstance(itemvalue, int):
+            for i in range(int(get_choice(item, inventoryweights))):
+                startitems.append(item)
         if get_choice(item, inventoryweights):
             startitems.append(item)
+    if glitches_required in ['no_logic'] and 'Pegasus Boots' not in startitems:
+        startitems.append('Pegasus Boots')
     ret.startinventory = ','.join(startitems)
 
     if 'rom' in weights: