diff --git a/DungeonRandomizer.py b/DungeonRandomizer.py
index 68858c9e..d04d6fb5 100755
--- a/DungeonRandomizer.py
+++ b/DungeonRandomizer.py
@@ -218,8 +218,8 @@ def parse_arguments(argv, no_defaults=False):
                              Select the rate at which the menu opens and closes.
                              (default: %(default)s)
                              ''')
-    parser.add_argument('--quickswap', help='Enable quick item swapping with L and R.', action='store_true')
-    parser.add_argument('--disablemusic', help='Disables game music.', action='store_true')
+    parser.add_argument('--quickswap', default=defval(False), help='Enable quick item swapping with L and R.', action='store_true')
+    parser.add_argument('--disablemusic', default=defval(False), help='Disables game music.', action='store_true')
     parser.add_argument('--mapshuffle', default=defval(False), help='Maps are no longer restricted to their dungeons, but can be anywhere', action='store_true')
     parser.add_argument('--compassshuffle', default=defval(False), help='Compasses are no longer restricted to their dungeons, but can be anywhere', action='store_true')
     parser.add_argument('--keyshuffle', default=defval(False), help='Small Keys are no longer restricted to their dungeons, but can be anywhere', action='store_true')
diff --git a/RoomData.py b/RoomData.py
index add738e6..e80fb087 100644
--- a/RoomData.py
+++ b/RoomData.py
@@ -239,6 +239,8 @@ def create_rooms(world, player):
     world.get_room(0x61, player).swap(5, 6)  # puts the Incognito Entrance at the end, so it can be deleted
     world.get_room(0x62, player).swap(1, 4)  # puts the exit at pos 1 - enables pos 3
     world.get_room(0x77, player).swap(0, 1)  # fixes Hera Lobby Key Stairs - entrance now at pos 0
+    if world.enemy_shuffle[player] != 'none':
+        world.get_room(0xc0, player).change(0, DoorKind.Normal)  # fix this kill room if enemizer is on
 
 
 class Room(object):
diff --git a/Rules.py b/Rules.py
index a29ec51d..23c6d2c6 100644
--- a/Rules.py
+++ b/Rules.py
@@ -217,6 +217,7 @@ def global_rules(world, player):
     set_defeat_dungeon_boss_rule(world.get_location('Skull Woods - Prize', player))
 
     # blind can't have the small key? - not necessarily true anymore - but likely still
+    set_rule(world.get_location('Thieves\' Town - Big Chest', player), lambda state: state.has('Hammer', player))
     for entrance in ['Thieves Basement Block Path', 'Thieves Blocked Entry Path', 'Thieves Conveyor Block Path', 'Thieves Conveyor Bridge Block Path']:
         set_rule(world.get_entrance(entrance, player), lambda state: state.can_lift_rocks(player))
     for location in ['Thieves\' Town - Blind\'s Cell', 'Thieves\' Town - Boss']: