Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -42,11 +42,11 @@
 CSIPATH=$(shell which csi)
 CKPATH=$(shell dirname $(shell dirname $(CSIPATH)))
 # ARCHSTR=$(shell uname -m)_$(shell uname -r)
 # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
 # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
-ARCHSTR=$(shell lsb_release -sr)
+ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 PNGFILES = $(shell cd docs/manual;ls *png)
 
 #all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -42,11 +42,11 @@
 
 (define *server-loop-heart-beat* (current-seconds))
 
 ;;======================================================================
 ;; S E R V E R
-;;======================================================================
+;; ======================================================================
 
 ;; Call this to start the actual server
 ;;
 
 (define *db:process-queue-mutex* (make-mutex))

Index: subrun.scm
==================================================================
--- subrun.scm
+++ subrun.scm
@@ -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 )
@@ -180,12 +181,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)