diff --git a/src/dodal/plans/scanspec.py b/src/dodal/plans/scanspec.py
index 162cf68cdd..b487d3e01d 100644
--- a/src/dodal/plans/scanspec.py
+++ b/src/dodal/plans/scanspec.py
@@ -40,7 +40,7 @@ def spec_scan(
     yield from bp.scan_nd(detectors, _as_cycler(spec), md=_md)
 
 
-def _as_cycler(spec: Spec[str]) -> Cycler:
+def _as_cycler(spec: Spec[Movable]) -> Cycler:
     """
     Convert a scanspec to a cycler for compatibility with legacy Bluesky plans such as
     `bp.scan_nd`. Use the midpoints of the scanspec since cyclers are normally used
diff --git a/tests/preprocessors/test_filesystem_metadata.py b/tests/preprocessors/test_filesystem_metadata.py
index 6904f3bb1c..9535f17a70 100644
--- a/tests/preprocessors/test_filesystem_metadata.py
+++ b/tests/preprocessors/test_filesystem_metadata.py
@@ -25,7 +25,7 @@
     LocalDirectoryServiceClient,
     StaticVisitPathProvider,
 )
-from dodal.plans.data_session_metadata import (
+from dodal.plan_stubs.data_session_metadata import (
     DATA_SESSION,
     attach_data_session_metadata_wrapper,
 )