diff --git a/workflows/linc_target/gsmcal.cwl b/workflows/linc_target/gsmcal.cwl
index e0d81bf3a817b1b71b6c869c2080b550be0e0846..25075e8ef7d17a529fa2c29432c02bb7497643a9 100644
--- a/workflows/linc_target/gsmcal.cwl
+++ b/workflows/linc_target/gsmcal.cwl
@@ -388,7 +388,7 @@ steps:
     out:
       - id: output
     run: ../../steps/merge_array.cwl
-    label: merge_array_full
+    label: merge_array_concat_full
 
   - id: aoflag
     in:
@@ -534,7 +534,8 @@ steps:
       - id: outsolutions
     run: ./selfcal_targ.cwl
     label: selfcal_target
-    when: $(inputs.execute)
+    when: $(inputs.execute && inputs.selfcal_strategy == 'LBA')
+
   - id: h5parm_collector
     in:
       - id: h5parmFiles