Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -86,10 +86,15 @@
 			"-use-local"
 			"-skip-version-check"
 			)
 		 args:arg-hash
 		 0))
+
+(if (not (null? remargs))
+    (begin
+      (print "Unrecognised arguments: " (string-intersperse remargs " "))
+      (exit)))
 
 (if (args:get-arg "-h")
     (begin
       (print help)
       (exit)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -553,11 +553,11 @@
 	      (list  "MT_ITEMPATH"  item-path)
 	      (list  "MT_RUNNAME"   runname)
 	      (list  "MT_MEGATEST"  megatest)
 	      (list  "MT_TARGET"    target)
 	      (list  "MT_LINKTREE"  (configf:lookup *configdat* "setup" "linktree"))
-	      (list  "MT_TESTSUITENAME" (common:get-testsuite-name))))
+	      (list  "MT_TESTSUITE_NAME" (common:get-testsuite-name))))
 
 	  (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path)))
 	  ;; (change-directory top-path)
 	  ;; Can setup as client for server mode now
 	  ;; (client:setup)
@@ -824,11 +824,13 @@
 	  (begin
 	    (debug:print-error 0 *default-log-port* "linktree not defined in [setup] section of megatest.config")
 	    )))
     (if (and *toppath*
 	     (directory-exists? *toppath*))
-	(setenv "MT_RUN_AREA_HOME" *toppath*)
+	(begin
+	  (setenv "MT_RUN_AREA_HOME" *toppath*)
+	  (setenv "MT_TESTSUITE_NAME" (common:get-testsuite-name)))
 	(begin
 	  (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.")))
     *toppath*))
 
 (define (get-best-disk confdat testconfig)