diff --git a/worlds/mlss/Client.py b/worlds/mlss/Client.py
index 1f08b85610d6..c60ad26911d0 100644
--- a/worlds/mlss/Client.py
+++ b/worlds/mlss/Client.py
@@ -143,17 +143,26 @@ async def game_watcher(self, ctx: "BizHawkClientContext") -> None:
             # If RAM address isn't 0x0 yet break out and try again later to give the rest of the items
             for i in range(len(ctx.items_received) - received_index):
                 item_data = items_by_id[ctx.items_received[received_index + i].item]
-                b = await bizhawk.guarded_read(ctx.bizhawk_ctx, [(0x3057, 1, "EWRAM")], [(0x3057, [0x0], "EWRAM")])
-                if b is None:
+                result = False
+                total = 0
+                while not result:
+                    await asyncio.sleep(0.05)
+                    total += 0.05
+                    result = await bizhawk.guarded_write(
+                        ctx.bizhawk_ctx,
+                        [
+                            (0x3057, [id_to_RAM(item_data.itemID)], "EWRAM")
+                        ],
+                        [(0x3057, [0x0], "EWRAM")]
+                    )
+                if not result:
                     break
                 await bizhawk.write(
                     ctx.bizhawk_ctx,
                     [
-                        (0x3057, [id_to_RAM(item_data.itemID)], "EWRAM"),
                         (0x4808, [(received_index + i + 1) // 0x100, (received_index + i + 1) % 0x100], "EWRAM"),
-                    ],
+                    ]
                 )
-                await asyncio.sleep(0.1)
 
             # Early return and location send if you are currently in a shop,
             # since other flags aren't going to change
diff --git a/worlds/mlss/Locations.py b/worlds/mlss/Locations.py
index 8c00432a8f06..ae7eb25fabfe 100644
--- a/worlds/mlss/Locations.py
+++ b/worlds/mlss/Locations.py
@@ -289,8 +289,9 @@ class MLSSLocation(Location):
     LocationData("Hoohoo Mountain Base Boostatue Room Digspot 3 (Rightside)", 0x39D9E9, 0),
     LocationData("Hoohoo Mountain Base Mole Near Teehee Valley", 0x277A45, 1),
     LocationData("Teehee Valley Entrance To Hoohoo Mountain Digspot", 0x39E5B5, 0),
-    LocationData("Teehee Valley Solo Luigi Maze Room 2 Digspot 1", 0x39E5C8, 0),
-    LocationData("Teehee Valley Solo Luigi Maze Room 2 Digspot 2", 0x39E5D0, 0),
+    LocationData("Teehee Valley Upper Maze Room 1 Block", 0x39E5E0, 0),
+    LocationData("Teehee Valley Upper Maze Room 2 Digspot 1", 0x39E5C8, 0),
+    LocationData("Teehee Valley Upper Maze Room 2 Digspot 2", 0x39E5D0, 0),
     LocationData("Hoohoo Mountain Base Guffawha Ruins Entrance Digspot", 0x39DA0B, 0),
     LocationData("Hoohoo Mountain Base Teehee Valley Entrance Digspot", 0x39DA20, 0),
     LocationData("Hoohoo Mountain Base Teehee Valley Entrance Block", 0x39DA18, 0),
@@ -617,7 +618,6 @@ class MLSSLocation(Location):
     LocationData("Teehee Valley Past Ultra Hammer Rock Block 2", 0x39E590, 0),
     LocationData("Teehee Valley Past Ultra Hammer Rock Digspot 1", 0x39E598, 0),
     LocationData("Teehee Valley Past Ultra Hammer Rock Digspot 3", 0x39E5A8, 0),
-    LocationData("Teehee Valley Solo Luigi Maze Room 1 Block", 0x39E5E0, 0),
     LocationData("Teehee Valley Before Trunkle Digspot", 0x39E5F0, 0),
     LocationData("S.S. Chuckola Storage Room Block 1", 0x39E610, 0),
     LocationData("S.S. Chuckola Storage Room Block 2", 0x39E628, 0),
diff --git a/worlds/mlss/Rom.py b/worlds/mlss/Rom.py
index 7cbbe8875195..3bbbea30cbc9 100644
--- a/worlds/mlss/Rom.py
+++ b/worlds/mlss/Rom.py
@@ -88,7 +88,7 @@ def hidden_visible(caller: APProcedurePatch, rom: bytes):
             return rom
         stream = io.BytesIO(rom)
 
-        for location in all_locations:
+        for location in [location for location in all_locations if location.itemType == 0]:
             stream.seek(location.id - 6)
             b = stream.read(1)
             if b[0] == 0x10 and options["block_visibility"] == 1:
@@ -333,7 +333,7 @@ def write_tokens(world: "MLSSWorld", patch: MLSSProcedurePatch) -> None:
             continue
         if not world.options.coins and "Coin" in location_name:
             continue
-        location = world.multiworld.get_location(location_name, world.player)
+        location = world.get_location(location_name)
         item = location.item
         address = [address for address in all_locations if address.name == location.name]
         item_inject(world, patch, location.address, address[0].itemType, item)
diff --git a/worlds/mlss/__init__.py b/worlds/mlss/__init__.py
index f44343c230d0..ecacbee44261 100644
--- a/worlds/mlss/__init__.py
+++ b/worlds/mlss/__init__.py
@@ -55,7 +55,7 @@ class MLSSWorld(World):
     settings: typing.ClassVar[MLSSSettings]
     item_name_to_id = {name: data.code for name, data in item_table.items()}
     location_name_to_id = {loc_data.name: loc_data.id for loc_data in all_locations}
-    required_client_version = (0, 4, 5)
+    required_client_version = (0, 5, 0)
 
     disabled_locations: List[str]
 
@@ -135,21 +135,7 @@ def create_items(self) -> None:
             filler_items += [item.itemName for _ in range(freq)]
 
         # And finally take as many fillers as we need to have the same amount of items and locations.
-        remaining = len(all_locations) - len(required_items) - 5
-        if self.options.castle_skip:
-            remaining -= len(bowsers) + len(bowsersMini) - (5 if self.options.chuckle_beans == 0 else 0)
-        if self.options.skip_minecart and self.options.chuckle_beans == 2:
-            remaining -= 1
-        if self.options.disable_surf:
-            remaining -= 1
-        if self.options.harhalls_pants:
-            remaining -= 1
-        if self.options.chuckle_beans == 0:
-            remaining -= 192
-        if self.options.chuckle_beans == 1:
-            remaining -= 59
-        if not self.options.coins:
-            remaining -= len(coins)
+        remaining = len(all_locations) - len(required_items) - len(self.disabled_locations) - 5
 
         self.multiworld.itempool += [
             self.create_item(filler_item_name) for filler_item_name in self.random.sample(filler_items, remaining)