diff --git a/src/aare/daq/operations/mounting/service.py b/src/aare/daq/operations/mounting/service.py
index 1f11058c..0ff37778 100644
--- a/src/aare/daq/operations/mounting/service.py
+++ b/src/aare/daq/operations/mounting/service.py
@@ -143,7 +143,7 @@ class MountingService:
         self._check_hutch_safety()
         self.ctx.deps.devs.smargon_move_home()
         self.ctx.deps.devs.aerotech_pos = self.ctx.settings.mount_position
-        self._magnet_position_sensor_check(timeout=360.0)
+        self._magnet_position_sensor_check(timeout=10.0)
         self.ctx.deps.devs.tell.check_enable_motion()
         self.ctx.deps.devs.tell.wait_not_busy()
         # enable_motion releases the door safety, so the door can only be
diff --git a/src/aare/devices/bec_worker.py b/src/aare/devices/bec_worker.py
index cacb1b48..f5e51244 100644
--- a/src/aare/devices/bec_worker.py
+++ b/src/aare/devices/bec_worker.py
@@ -528,7 +528,7 @@ class BECClientWorker:
         self.macros.save_current_position(self.dev.coll_y, "in")
 
     def save_current_aerotech_position(self):
-        self.macros.save_current_position(self.dev.aerotech, "work", axis="x")
+        self.macros.save_current_position(self.dev.aerotech, "in", axis="x")
         self.macros.save_current_position(self.dev.aerotech, "work", axis="y")
         self.macros.save_current_position(self.dev.aerotech, "work", axis="z")