diff --git a/archinstall/lib/models/mirrors.py b/archinstall/lib/models/mirrors.py
index 4f559261..7768c50b 100644
--- a/archinstall/lib/models/mirrors.py
+++ b/archinstall/lib/models/mirrors.py
@@ -104,7 +104,7 @@ class MirrorStatusEntryV3(BaseModel):
 		return value
 
 	@model_validator(mode='after')
-	def debug_output(self) -> 'MirrorStatusEntryV3':
+	def debug_output(self) -> Self:
 		from ..args import arch_config_handler
 
 		self._hostname, *port = urllib.parse.urlparse(self.url).netloc.split(':', 1)
diff --git a/archinstall/tui/types.py b/archinstall/tui/types.py
index 956d91c5..d57123ae 100644
--- a/archinstall/tui/types.py
+++ b/archinstall/tui/types.py
@@ -49,10 +49,10 @@ class MenuKeys(Enum):
 	SCROLL_DOWN = frozenset({338})
 
 	@classmethod
-	def from_ord(cls, key: int) -> list['MenuKeys']:
-		matches = []
+	def from_ord(cls, key: int) -> list[Self]:
+		matches: list[Self] = []
 
-		for group in MenuKeys:
+		for group in cls:
 			if key in group.value:
 				matches.append(group)