diff --git a/iexcode/instruments/xrays.py b/iexcode/instruments/xrays.py
index 1934be52e067e745ba30553cd612ded09b9b138e..39420508a48a78f8889c23c871e4aed716a6460d 100644
--- a/iexcode/instruments/xrays.py
+++ b/iexcode/instruments/xrays.py
@@ -422,8 +422,6 @@ def scanXAS(hv_list,ID_tracking=False, **kwargs):
     kwargs.setdefault("m3r",True)
     kwargs.setdefault("mcp",True)    
     kwargs.setdefault('execute',True)   
-
-    scan_dim=kwargs['scan_dim']
     
     #Setting up the ScanRecord for Mono and ID in Table mode
     mono_array,ID_array = BL_energy_tables(hv_list,**kwargs)
@@ -458,7 +456,7 @@ def scanXAS(hv_list,ID_tracking=False, **kwargs):
     #Scanning
     if kwargs['execute']:
         mono_energy_set(mono_array[0])
-        scan_go(scan_dim)
+        scan_go(scan_dim=kwargs['scan_dim'])
     
         #Setting everything back
         mono_scan_after()
diff --git a/iexcode/macros/cam_macros.py b/iexcode/macros/cam_macros.py
index 6ec96d1dc0a043176dd44e913e12ca346a1afa09..34234e81c0e254ef9b92df90f2d59f65192bab73 100644
--- a/iexcode/macros/cam_macros.py
+++ b/iexcode/macros/cam_macros.py
@@ -52,7 +52,7 @@ def cam_scan_setup(cam_num,ADtype='TIFF',**kwargs):
         prefix = dtype by default
     """
     ADplugin = cam_pv_dictionary()[cam_num]+ADtype+"1:"
-    ADplugin_ScanSetup(ADplugin,iex.BL.mda, **kwargs)  
+    ADplugin_ScanSetup(ADplugin,**kwargs)  
 
 def cam_live(cam_num):
     """
diff --git a/iexcode/macros/start_of_the_week.py b/iexcode/macros/start_of_the_week.py
index d504148d15eb0de27981beec29a44f54ed5e629a..9c5dda8897e017bede25abd15797aab6808359c1 100644
--- a/iexcode/macros/start_of_the_week.py
+++ b/iexcode/macros/start_of_the_week.py
@@ -236,11 +236,11 @@ def sotw_ID_steering(detCA4,**kwargs):
     scanNum_v = last_mda()
     
     flagfit, h = interactive_fit_mda('H_center',scanNum_h,detCA4,1,'gauss',xrange=[-1,1])
-    if flagfit == '' or flag <0:
+    if flagfit == '' or flagfit <0:
         return
 
     flagfit, v = interactive_fit_mda('V_center',scanNum_v,detCA4,1,'gauss',xrange=[-1,1])
-    if flagfit == '' or flag <0:
+    if flagfit == '' or flagfit <0:
         return
     try:    
         ID_steering_message(h,v)
@@ -249,8 +249,8 @@ def sotw_ID_steering(detCA4,**kwargs):
         print('\nUnable to calculate ID steering')
         print('steering out => move beam more positive (10 urad ~ 0.25 mm)')
         print('steering up  => move beam more positive (10 urad ~ 0.25 mm)')
-        flag = interactive_fct()
-    return flag
+        flagfit = interactive_fct()
+    return flagfit
 
 def sotw_wire(detH,detV,**kwargs):
     """