diff --git a/python_payload/apps/appearance/__init__.py b/python_payload/apps/appearance/__init__.py
index 979081fd6d2c8c5c016500a254d4ec0bce0a4c1f..b00fe99e0b44e850ffdf494d9d63f5ef167cdf4d 100644
--- a/python_payload/apps/appearance/__init__.py
+++ b/python_payload/apps/appearance/__init__.py
@@ -4,6 +4,7 @@ from st3m import settings
 import leds
 import sys_display
 from st3m.ui import colours, led_patterns
+from ctx import Context
 
 
 class App(Application):
diff --git a/python_payload/apps/graphics_mode/__init__.py b/python_payload/apps/graphics_mode/__init__.py
index 1de216533ba85cc2284098c37b189856e0af32b3..39da6c0fec1b846780d928601ce81ec9d17f46c5 100644
--- a/python_payload/apps/graphics_mode/__init__.py
+++ b/python_payload/apps/graphics_mode/__init__.py
@@ -1,5 +1,6 @@
 from st3m.application import Application
 import math, random, sys_display
+from ctx import Context
 
 
 class App(Application):
diff --git a/python_payload/apps/mandelbrot/__init__.py b/python_payload/apps/mandelbrot/__init__.py
index 0de97fb48b3be42019035e12ba80d1e51e9c0c81..d7808d74df5a447e683804094a05a51c890d0a40 100644
--- a/python_payload/apps/mandelbrot/__init__.py
+++ b/python_payload/apps/mandelbrot/__init__.py
@@ -1,5 +1,6 @@
 from st3m.application import Application
 import sys_display, math, random
+from ctx import Context
 
 
 class App(Application):
diff --git a/python_payload/apps/w1f1/k3yboard.py b/python_payload/apps/w1f1/k3yboard.py
index c5333d1b783af816c258f27f67b0cba91a0bddae..a04a342012988139bfa7e781199ab8c5c57b581b 100644
--- a/python_payload/apps/w1f1/k3yboard.py
+++ b/python_payload/apps/w1f1/k3yboard.py
@@ -6,7 +6,7 @@ from ctx import Context
 import st3m.run
 from st3m import Responder, InputState
 from st3m.application import Application, ApplicationContext
-from st3m.goose import ABCBase, Enum
+from st3m.goose import ABCBase, Enum, Optional
 from st3m.ui.view import BaseView, ViewManager
 from st3m.utils import tau
 
@@ -57,7 +57,7 @@ class TextInputModel(Model):
     def input_right(self) -> str:
         return self._input_right
 
-    def move_cursor(self, direction: self.CursorDirection) -> None:
+    def move_cursor(self, direction: "TextInputModel.CursorDirection") -> None:
         """
         Moves the cursor one step in specified direction. Any pending input will be committed beforehand.
         """