diff --git a/dzgui/api/bm.py b/dzgui/api/bm.py
index c92a3f5..67dbd63 100644
--- a/dzgui/api/bm.py
+++ b/dzgui/api/bm.py
@@ -1,12 +1,15 @@
 import logging
 import requests
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 
 from dzgui.const.constants import APP_NAME
 from dzgui.const.endpoints import BM_SERVERS
 
 logger = logging.getLogger(APP_NAME)
 
+if TYPE_CHECKING:
+    from dzgui.api.servers import Record
+
 
 def get_attributes(key: str, uid: int) -> str:
     # TODO: handle if key is not set
diff --git a/dzgui/controllers/emitter.py b/dzgui/controllers/emitter.py
index 9857d1b..fe6e202 100644
--- a/dzgui/controllers/emitter.py
+++ b/dzgui/controllers/emitter.py
@@ -1,4 +1,4 @@
-from typing import Union, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 import gi
 
@@ -94,7 +94,7 @@ class Emitter(GObject.GObject):
         ),
     )
     def distcalc_ended(
-        self, dist: Union[str, None], context: Union["ServerTab", "NotebookPage"]
+        self, dist: str | None, context: "ServerTab | NotebookPage"
     ) -> None:
         pass