diff --git a/DoorShuffle.py b/DoorShuffle.py
index 53676cb9..3ce078f0 100644
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -19,6 +19,7 @@ from Utils import ncr, kth_combination
 
 
 def link_doors(world, player):
+    orig_swamp_patch = world.swamp_patch_required[player]
     attempt, valid = 1, False
     while not valid:
         try:
@@ -42,6 +43,7 @@ def link_doors(world, player):
             reset_portals(world, player)
             reset_rooms(world, player)
             world.get_door("Skull Pinball WS", player).no_exit()
+            world.swamp_patch_required[player] = orig_swamp_patch
 
 
 def link_doors_main(world, player):
@@ -466,8 +468,8 @@ def choose_portals(world, player):
                 world.get_room(0xd5, player).change(0, DoorKind.DungeonEntrance)
 
     if not world.swamp_patch_required[player]:
-        swamp_region = world.get_entrance('Swamp Palace', player).connected_region
-        if swamp_region.name != 'Swamp Lobby':
+        swamp_portal = world.get_portal('Swamp', player)
+        if swamp_portal.door.name != 'Swamp Lobby S':
             world.swamp_patch_required[player] = True
 
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dd2ce1fc..b9d1cdad 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -14,6 +14,9 @@ Thanks to qadan, cheuer, & compiling
 
 # Bug Fixes and Notes.
 
+* 0.4.0.9
+	* Fixes for stats and P/C indicator (thanks Kara)
+	* Swamp lobby fixes (thanks Catobat)
 * 0.4.0.8
 	* Ganon jokes added for when silvers aren't available
 	* Some text updated (Blind jokes, uncle text)
diff --git a/Rom.py b/Rom.py
index 72be78d0..64a32986 100644
--- a/Rom.py
+++ b/Rom.py
@@ -30,7 +30,7 @@ from EntranceShuffle import door_addresses, exit_ids
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '736978dd2b3a2bb109ac80ed7c048e67'
+RANDOMIZERBASEHASH = 'df3386b7a48d79950a1432b8bbaafde1'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 22b25506..2ef0bf7d 100644
Binary files a/data/base2current.bps and b/data/base2current.bps differ