diff --git a/worlds/ahit/Rules.py b/worlds/ahit/Rules.py
index b2e2ca7989..42d1f6a547 100644
--- a/worlds/ahit/Rules.py
+++ b/worlds/ahit/Rules.py
@@ -229,7 +229,7 @@ def set_rules(world: "HatInTimeWorld"):
              and can_use_hat(state, world, HatType.BREWING) and can_use_hat(state, world, HatType.DWELLER))
 
     if world.is_dlc1():
-        add_rule(world.multiworld.get_entrance("Telescope -> The Arctic Cruise", world.player),
+        add_rule(world.multiworld.get_entrance("Telescope -> Arctic Cruise", world.player),
                  lambda state: state.has("Time Piece", world.player, world.chapter_timepiece_costs[ChapterIndex.ALPINE])
                  and state.has("Time Piece", world.player, world.chapter_timepiece_costs[ChapterIndex.CRUISE]))
 
@@ -253,8 +253,7 @@ def set_rules(world: "HatInTimeWorld"):
         loc = world.multiworld.get_location(key, world.player)
 
         for hat in data.required_hats:
-            if hat is not HatType.NONE:
-                add_rule(loc, lambda state, h=hat: can_use_hat(state, world, h))
+            add_rule(loc, lambda state, h=hat: can_use_hat(state, world, h))
 
         if data.hookshot:
             add_rule(loc, lambda state: can_use_hookshot(state, world))
diff --git a/worlds/ahit/Types.py b/worlds/ahit/Types.py
index fb6185188f..093413a0cb 100644
--- a/worlds/ahit/Types.py
+++ b/worlds/ahit/Types.py
@@ -55,21 +55,21 @@ class Difficulty(IntEnum):
 
 
 class LocData(NamedTuple):
-    id: Optional[int] = 0
-    region: Optional[str] = ""
-    required_hats: Optional[List[HatType]] = [HatType.NONE]
-    hookshot: Optional[bool] = False
-    dlc_flags: Optional[HatDLC] = HatDLC.none
-    paintings: Optional[int] = 0  # Paintings required for Subcon painting shuffle
-    misc_required: Optional[List[str]] = []
+    id: int = 0
+    region: str = ""
+    required_hats: List[HatType] = []
+    hookshot: bool = False
+    dlc_flags: HatDLC = HatDLC.none
+    paintings: int = 0  # Paintings required for Subcon painting shuffle
+    misc_required: List[str] = []
 
     # For UmbrellaLogic setting only.
-    hit_type: Optional[HitType] = HitType.none
+    hit_type: HitType = HitType.none
 
     # Other
-    act_event: Optional[bool] = False  # Only used for event locations. Copy access rule from act completion
-    nyakuza_thug: Optional[str] = ""  # Name of Nyakuza thug NPC (for metro shops)
-    snatcher_coin: Optional[str] = ""  # Only for Snatcher Coin event locations, name of the Snatcher Coin item
+    act_event: bool = False  # Only used for event locations. Copy access rule from act completion
+    nyakuza_thug: str = ""  # Name of Nyakuza thug NPC (for metro shops)
+    snatcher_coin: str = ""  # Only for Snatcher Coin event locations, name of the Snatcher Coin item
 
 
 class ItemData(NamedTuple):