diff --git a/lofar-cwl/steps/DPPP.cwl b/lofar-cwl/steps/DPPP.cwl
index a756093a275e63decbec9ed6425628dfb5efedb9..47e4cf1f905dab76ace240d3fc3f7b6887901cf4 100755
--- a/lofar-cwl/steps/DPPP.cwl
+++ b/lofar-cwl/steps/DPPP.cwl
@@ -97,4 +97,4 @@ hints:
     dockerPull: lofareosc/lofar-pipeline
 stdout: DPPP.log
 requirements:
-  - class: InlineJavascriptRequirement
+  - class: InlineJavascriptRequirement
\ No newline at end of file
diff --git a/lofar-cwl/steps/check_ateam_separation.cwl b/lofar-cwl/steps/check_ateam_separation.cwl
index 1c383d46dc104cca27c070d63c0d3f076794197e..977d9f86e63f3b003833aee677d330f1f188253d 100755
--- a/lofar-cwl/steps/check_ateam_separation.cwl
+++ b/lofar-cwl/steps/check_ateam_separation.cwl
@@ -39,6 +39,6 @@ outputs:
 label: check_Ateam_separation
 hints:
   - class: DockerRequirement
-    dockerPull: lofareosc/lofar-pipeline
+    dockerPull: lofareosc/prefactor
   - class: InlineJavascriptRequirement
 stdout: Ateam_separation.log
diff --git a/lofar-cwl/steps/makesourcedb.cwl b/lofar-cwl/steps/makesourcedb.cwl
index fec1acf4708bbd8857e01b840a51cb93cd8fc60a..eb5c2e7c7b8f09c0a2c97ea4512bb241cff17fb5 100755
--- a/lofar-cwl/steps/makesourcedb.cwl
+++ b/lofar-cwl/steps/makesourcedb.cwl
@@ -50,7 +50,7 @@ outputs:
 label: make_sourcedb_ateam
 hints:
   - class: DockerRequirement
-    dockerPull: 'lofareosc/lofar-pipeline:latest'
+    dockerPull: 'lofareosc/prefactor:latest'
 stdout: make_sourcedb_ateam.log
 requirements:
   - class: InlineJavascriptRequirement
diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index 9efd9f7fd9ab767ecbf1829bc76043c3cf7d637e..7bbc7900b2e594933164e40e0e1a0e0b5187f105 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -257,7 +257,8 @@ steps:
       - id: output_directory_names
         source: parsetgenerator/output_directory_names
       - id: baseline
-        source: msin_baseline
+        source: 
+          - msin_baseline
     out:
       - id: msout
       - id: secondary_output_files
@@ -284,3 +285,6 @@ steps:
     'sbg:y': -55.93873977661133
 requirements:
   - class: SubworkflowFeatureRequirement
+  - class: ScatterFeatureRequirement
+  - class: StepInputExpressionRequirement
+  - class: InlineJavascriptRequirement
\ No newline at end of file
diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index c7f4f9ed06fe99b2cfb32ce4869fdc3feebf6247..1e84665e1833386275e3616214bdc46f7311ed9b 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -154,7 +154,7 @@ inputs:
     'sbg:x': -1000
     'sbg:y': 1100
   - id: min_separation
-    type: float?
+    type: int?
     default: 30
     'sbg:x': -1000
     'sbg:y': 1200
@@ -320,3 +320,4 @@ steps:
     'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
+  - class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 2dda40da752105ceb888cb036ce5c0282a188237..d71d33b4f9c7e92ff00c9efeb6060db7e44141d0 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -283,4 +283,3 @@ steps:
     'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 0b0b193e7772914173b5d50f876eadba3e065c24..511b6adb67fcff295edf29c1745ed69b90018331 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -209,4 +209,4 @@ steps:
     'sbg:y': 300
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: ScatterFeatureRequirement
+  - class: ScatterFeatureRequirement
\ No newline at end of file