diff --git a/collects/meta/drdr/good-init.sh b/collects/meta/drdr/good-init.sh
index f0693a3321..ccf0314e68 100755
--- a/collects/meta/drdr/good-init.sh
+++ b/collects/meta/drdr/good-init.sh
@@ -19,7 +19,7 @@ kill_all() {
 run_loop () { # <basename> <kill?>
   while true; do
     echo "$1: compiling"
-    "$PLTROOT/bin/raco" make -k "$1.rkt"
+    "$PLTROOT/bin/raco" make "$1.rkt"
     echo "$1: running"
     "$MZ" -t "$1.rkt" 2>&1 >> "$LOGS/$1.log" &
     echo "$!" > "$LOGS/$1.pid"
diff --git a/collects/meta/drdr/graph.rkt b/collects/meta/drdr/graph.rkt
index 7612e6e6ea..611de96328 100644
--- a/collects/meta/drdr/graph.rkt
+++ b/collects/meta/drdr/graph.rkt
@@ -12,7 +12,7 @@
     (path-timing-png-prefix filename))
   (system*/exit-code
    (path->string
-    (build-path (plt-directory) "plt" "bin" "mred-text"))
+    (build-path (plt-directory) "plt" "bin" "gracket-text"))
    "-t"
    (path->string (build-path (drdr-directory) "graphs" "build-graph.rkt"))
    "--"
diff --git a/collects/meta/drdr/graphs/README b/collects/meta/drdr/graphs/README
index 9edbda8f61..4ff5b4648f 100644
--- a/collects/meta/drdr/graphs/README
+++ b/collects/meta/drdr/graphs/README
@@ -1,13 +1,13 @@
 - build the global .png files with a recent svn build:
 
-    mred-text mk-img.rkt
+    gracket-text mk-img.rkt
 
   This will dump some png files in the current directory. Put them in
   some global place on the server
 
 - to build a script for a particular page, do this:
 
-   mred-text build-graph.rkt -l http://drdr.racket-lang.org/~a/collects/path/to/file.scm \
+   gracket-text build-graph.rkt -l http://drdr.racket-lang.org/~a/collects/path/to/file.scm \
                             --image-loc /static/data/graph-images/  \
                             file_scm.timing \
                             file_scm_png_file_prefix \
diff --git a/collects/meta/drdr/plt-build.rkt b/collects/meta/drdr/plt-build.rkt
index 20ba7cbc1f..47813bbf5b 100644
--- a/collects/meta/drdr/plt-build.rkt
+++ b/collects/meta/drdr/plt-build.rkt
@@ -152,6 +152,9 @@
     (path->string (build-path trunk-dir "bin" "racket")))
   (define raco-path
     (path->string (build-path trunk-dir "bin" "raco")))
+  ; XXX Remove
+  (define mzc-path
+    (path->string (build-path trunk-dir "bin" "mzc")))
   (define gracket-text-path
     (path->string (build-path trunk-dir "bin" "gracket-text")))
   (define gracket-path
@@ -188,7 +191,9 @@
                                               [(list-rest (or 'mzscheme 'racket) rst)
                                                (lambda () (list* racket-path rst))]
                                               [(list-rest 'mzc rst)
-                                               (lambda () (list* raco-path "make" rst))]
+                                               (lambda () (list* mzc-path rst))]
+                                              [(list-rest 'raco rst)
+                                               (lambda () (list* raco-path rst))]
                                               [(list-rest (or 'mred 'mred-text
                                                               'gracket 'gracket-text)
                                                           rst)
diff --git a/collects/meta/drdr/run-collect.rkt b/collects/meta/drdr/run-collect.rkt
index fa1aabfc35..d51f889455 100644
--- a/collects/meta/drdr/run-collect.rkt
+++ b/collects/meta/drdr/run-collect.rkt
@@ -30,10 +30,11 @@
     (list* command args))
   (define-values
     (the-process stdout stdin stderr)
-    (apply subprocess
-           #f #f #f
-           new-command 
-           new-args))
+    (parameterize ([subprocess-group-enabled #t])
+      (apply subprocess
+             #f #f #f
+             new-command 
+             new-args)))
   
   (notify! "Running: ~a ~S" command args)  
   
@@ -76,6 +77,8 @@
                                     (λ (_)
                                       (define end-time 
                                         (current-inexact-milliseconds))
+                                      (subprocess-kill the-process #f)
+                                      (sleep)
                                       (subprocess-kill the-process #t)
                                       (loop open-ports end-time status log)))
                         (handle-evt the-process