diff --git a/steps/DPPP.cwl b/steps/DPPP.cwl
index aabd75e96b101beb77c14855e356e70947f1b00b..894afcff77abc699801ec7f7fb4bef415269cd03 100755
--- a/steps/DPPP.cwl
+++ b/steps/DPPP.cwl
@@ -17,7 +17,7 @@ inputs:
       prefix: msin=
       separate: false
     doc: Input Measurement Set
-  - default: out.MS
+  - default: "."
     id: msout_name
     type: string
     inputBinding:
@@ -76,7 +76,7 @@ outputs:
     doc: Output Measurement Set
     type: Directory
     outputBinding:
-      glob: '$(inputs.msout_name=="."?inputs.msin:inputs.msout_name)'
+      glob: '$(inputs.msout_name=="." ? inputs.msin.basename : inputs.msout)'
   - id: secondary_output_files
     doc: Secondary output files
     type: Any
@@ -121,3 +121,8 @@ hints:
 stdout: DPPP.log
 requirements:
   - class: InlineJavascriptRequirement
+  - class: InitialWorkDirRequirement
+    listing:
+      - entry: $(inputs.msin)
+        writable: true
+