diff --git a/config/devices.properties b/config/devices.properties
index 20743a92..acc446a4 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -75,9 +75,9 @@ RefocusBladeRing=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:RI|||
 RefocusBladeWall=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:WA|||
 RefocusYTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oy|Read||true
 RefocusZTrans=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oz|Read||true
-RefocusXRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oRx|Read||true
+RefocusXRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRx.A X03DA-OP-RMU:oRx|Read||true
 RefocusYRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRy.A X03DA-OP-RMU:oRy|||true
-RefocusZRot=ch.psi.pshell.epics.ChannelDouble|X03DA-OP-RMU:oRz|Read||true
+RefocusZRot=ch.psi.pshell.epics.Positioner|X03DA-OP-RMU:tRz.A X03DA-OP-RMU:oRz|Read||true
 MonoEnergy=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:CERBK|Read||true
 MonoCff=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkcff|Read||true
 MonoBeta=ch.psi.pshell.epics.ChannelDouble|X03DA-PGM:rbkbeta|Read||true
diff --git a/script/scan_guard.py b/script/scan_guard.py
index d8e62af6..6893dbb6 100644
--- a/script/scan_guard.py
+++ b/script/scan_guard.py
@@ -852,7 +852,7 @@ class ScanGuard(object):
 
         while self.running:
             self._ringcurrent.pv.poll()    #pend_event(timeout=1)
-            new_beam_ok = self.test or self.check_beam()
            
+            new_beam_ok = self.check_beam()
            
             if new_beam_ok != self.beam_ok:
                 self.beam_ok = new_beam_ok
                 if new_beam_ok:
@@ -980,6 +980,7 @@ if True: #__name__ == '__main__':
     args = parser.parse_args()
     #args.loglevel = "DEBUG"
 
+    args.attended = False
     main(args)