@@ -87,16 +87,17 @@
 
 (define (subrun:set-state-status test-run-dir state status new-state-status)
   (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
       (let* ((action-switches-str
               (conc "-set-state-status "new-state-status
-                                (if state (conc " -state "state ""))
-                                (if status (conc " -status "status) "")))
-             (log-prefix (subrun:sanitize-path
-                          (conc "set-state-status="new-state-status
-                                (if state (conc ":state="state ""))
-                                (if status (conc "+status="status) ""))))
+                    (if state (conc " -state "state) "")
+                    (if status (conc " -status "status) "")))
+             (log-prefix
+              (subrun:sanitize-path
+               (conc "set-state-status="new-state-status
+                     (if state (conc ":state="state) "")
+                     (if status (conc "+status="status) ""))))
              (submt-result 
               (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
         submt-result)))
 
 (define (subrun:remove-subrun test-run-dir keep-records )
@@ -136,11 +137,12 @@
                           test-run-dir
                           "foo"))
              (run-area   (if (list? info-alist)
                              (alist-ref "-start-dir" info-alist equal? #f)
                              #f)))
-        run-area)))
+        run-area)
+      #f))
 
 (define (subrun:selector+log-alist test-run-dir log-prefix)
   (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
          (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
          (subrundata   (with-input-from-file subrunfile read))
@@ -180,12 +182,13 @@
                           "-"
                           runname
                           "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
          (logfile       (conc
                          test-run-dir "/"
-                         (or (subrun:sanitize-path log-prefix) "")
-                         (if log-prefix "-" "")
+                         (if log-prefix
+                             (conc (subrun:sanitize-path log-prefix) "-")
+                             "")
                          compact-stem
                          ".log"))
          ;; swap out testpatt with modified test-patt and add -log
          (switch-alist  (cons
                          (cons "-log" logfile)