diff --git a/src/assets/ba_data/python/baclassic/_subsystem.py b/src/assets/ba_data/python/baclassic/_subsystem.py
index f5847c71..0889b7de 100644
--- a/src/assets/ba_data/python/baclassic/_subsystem.py
+++ b/src/assets/ba_data/python/baclassic/_subsystem.py
@@ -580,7 +580,7 @@ class ClassicSubsystem(babase.AppSubsystem):
         name: str,
         default: bool = False,
     ) -> Any:
-        """Returns a mapped value for an input device.
+        """Return a mapped value for an input device.
 
         This checks the user config and falls back to default values
         where available.
diff --git a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
index 2aba46a9..a4f193a4 100644
--- a/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/gamepad.py
@@ -133,6 +133,7 @@ class GamepadSettingsWindow(bui.Window):
             'analogStickUD_B',
             'enableSecondary',
         ]:
+            assert bui.app.classic is not None
             val = bui.app.classic.get_input_device_mapped_value(
                 self._input, button, default
             )
diff --git a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
index 11e5a1d7..3f445460 100644
--- a/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
+++ b/src/assets/ba_data/python/bauiv1lib/settings/keyboard.py
@@ -68,6 +68,7 @@ class ConfigKeyboardWindow(bui.Window):
             'buttonLeft',
             'buttonRight',
         ]:
+            assert bui.app.classic is not None
             self._settings[
                 button
             ] = bui.app.classic.get_input_device_mapped_value(