@@ -514,17 +514,19 @@
 	  (debug:print 2 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 	  ;; (print-call-chain (current-error-port)) ;; 
 	  )
 	(let* ((fullname  (conc "logs/" file))
 	       (mod-time  (file-modification-time fullname))
-	       (file-age  (- (current-seconds) mod-time)))
+	       (file-age  (- (current-seconds) mod-time))
+	       (file-old  (> file-age (* 48 60 60)))
+	       (file-big  (> (file-size fullname) 200000)))
 	  (hash-table-set! all-files file mod-time)
 	  (if (or (and (string-match "^.*.log" file)
-		       (> (file-size fullname) 200000))
+		       file-old
+		       file-big)
 		  (and (string-match "^server-.*.log" file)
-		       (> (- (current-seconds) (file-modification-time fullname))
-			  (* 8 60 60))))
+		       file-old))
 	      (let ((gzfile (conc fullname ".gz")))
 		(if (common:file-exists? gzfile)
 		    (begin
 		      (debug:print-info 0 *default-log-port* "removing " gzfile)
 		      (delete-file* gzfile)
@@ -534,11 +536,12 @@
 		(system (conc "gzip " fullname))
 		(inc-stat "gzipped")
 		(hash-table-set! all-files (conc file ".gz") file-age)  ;; add the .gz file and remove the base file
 		(hash-table-delete! all-files file)
 		)
-	      (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+	      (if (and (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+		       (file-exists? fullname)) ;; just in case it was gzipped - will get it next time
 		  (handle-exceptions
 		   exn
 		   #f
 		   (if (directory? fullname)
 		       (begin
@@ -902,11 +905,16 @@
 (define (assoc/default key lst . default)
   (let ((res (assoc key lst)))
     (if res (cadr res)(if (null? default) #f (car default)))))
 
 (define (common:get-testsuite-name)
-  (cmod:get-testsuite-name *toppath* *configdat*))
+  (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description.
+      (configf:lookup *configdat* "setup" "testsuite" )
+      (getenv "MT_TESTSUITE_NAME")
+      (if (string? *toppath* )
+          (pathname-file *toppath*)
+          #f))) ;; (pathname-file (current-directory)))))
 
 ;; safe getting of toppath
 (define (common:get-toppath areapath)
   (or *toppath*
       (if areapath
@@ -1652,17 +1660,29 @@
 		    ))))))
 
 ;; if it looks like a number -> convert it to a number, else return it
 ;;
 (define (common:lazy-convert inval)
-  (cmod:lazy-convert inval))
+  (let* ((as-num (if (string? inval)(string->number inval) #f)))
+    (or as-num inval)))
 
 ;; convert string a=1; b=2; c=a silly thing; d=
 ;; to '((a . 1)(b . 2)(c . "a silly thing")(d . ""))
 ;;
 (define (common:val->alist val #!key (convert #f))
-  (cmod:val->alist val #!key (convert #f)))
+  (let ((val-list (string-split-fields ";\\s*" val #:infix)))
+    (if val-list
+	(map (lambda (x)
+	       (let ((f (string-split-fields "\\s*=\\s*" x #:infix)))
+		 (case (length f)
+		   ((0) `(,#f))  ;; null string case
+		   ((1) `(,(string->symbol (car f))))
+		   ((2) `(,(string->symbol (car f)) . ,(let ((inval (cadr f)))
+							 (if convert (common:lazy-convert inval) inval))))
+		   (else f))))
+	     val-list)
+	'())))
 
 ;;======================================================================
 ;; S Y S T E M   S T U F F
 ;;======================================================================