diff --git a/pkgs/compiler-lib/compiler/commands/pack.rkt b/pkgs/compiler-lib/compiler/commands/pack.rkt
index db68d62889..eba5bf0865 100644
--- a/pkgs/compiler-lib/compiler/commands/pack.rkt
+++ b/pkgs/compiler-lib/compiler/commands/pack.rkt
@@ -71,10 +71,7 @@
                                     #f
                                     '("collects" "doc" "include" "lib"))
                 #:requires
-                ;; Get current version of mzscheme for require:
-                (let* ([i (get-info '("mzscheme"))]
-                       [v (and i (i 'version (lambda () #f)))])
-                  (list (list '("mzscheme") v))))
+                null)
       (when (verbose)
         (printf " [output to \"~a\"]\n" plt-output)))
     ;; Collection
diff --git a/pkgs/datalog/tests/racket.rkt b/pkgs/datalog/tests/racket.rkt
index bca96bbd4b..69c0c73a0e 100644
--- a/pkgs/datalog/tests/racket.rkt
+++ b/pkgs/datalog/tests/racket.rkt
@@ -74,7 +74,7 @@
           (hasheq 'A 'joseph3 'B 'lucy)
           (hasheq 'A 'joseph3 'B 'joseph1))))
  
- (local [(local-require tests/datalog/examples/ancestor)]
+ (local [(local-require datalog/tests/examples/ancestor)]
    (datalog theory
             (? (ancestor A B))))
  =>
@@ -85,7 +85,7 @@
        (hasheq 'A 'ebbon 'B 'john)
        (hasheq 'A 'ebbon 'B 'douglas))
  
-  (local [(local-require tests/datalog/paren-examples/ancestor)]
+  (local [(local-require datalog/tests/paren-examples/ancestor)]
    (datalog theory
             (? (ancestor A B))))
  =>
diff --git a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-image.rktl b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-image.rktl
index bda03fa5e8..5f8d768642 100644
--- a/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-image.rktl
+++ b/pkgs/htdp-pkgs/htdp-test/tests/htdp-lang/htdp-image.rktl
@@ -1,6 +1,6 @@
 ;; Load this one with GRacket
 
-(load-relative "../racket/loadtest.rktl")
+(load-relative (collection-file-path "loadtest.rktl" "tests/racket"))
 (require racket/gui/base
          teachpack/htdp/image
          htdp/error
diff --git a/pkgs/plt-services/meta/props b/pkgs/plt-services/meta/props
index 1ce4a7ba40..7532dab7b9 100755
--- a/pkgs/plt-services/meta/props
+++ b/pkgs/plt-services/meta/props
@@ -666,6 +666,18 @@ path/s is either such a string or a list of them.
 "pkgs/deinprogramm/run-dmda-code.rkt" drdr:command-line (mzc *)
 "pkgs/distributed-places-pkgs/distributed-places-doc/scribblings/distributed-places" responsible (tewk)
 "pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt" drdr:command-line #f
+"pkgs/distro-build" responsible (mflatt)
+"pkgs/distro-build/add-catalog.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/assemble-site.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/catalog-local.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/drive-clients.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/install-for-docs.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/install-pkgs.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/installer.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/manage-snapshots.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/pack-native.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/set-config.rkt" drdr:command-line (mzc *)
+"pkgs/distro-build/unpack-collects.rkt" drdr:command-line (mzc *)
 "pkgs/drracket-pkgs/drracket/browser" responsible (robby)
 "pkgs/drracket-pkgs/drracket/drracket" responsible (robby)
 "pkgs/drracket-pkgs/drracket/drracket/drracket.rkt" drdr:command-line (mzc *)
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/mz/expand-class.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/mz/expand-class.rktl
index 5cf21bd6b8..399f180366 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/mz/expand-class.rktl
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/benchmarks/mz/expand-class.rktl
@@ -1,7 +1,7 @@
 
-(let ([dir (build-path (collection-path "racket")
-                       "private")])
-  (with-input-from-file (build-path dir "class-internal.rkt")
+(let ([path (collection-file-path "class-internal.rkt" "racket/private")])
+  (define-values (dir name dir?) (split-path path))
+  (with-input-from-file path
     (lambda ()
       (parameterize ([current-load-relative-directory dir]
 		     [read-accept-reader #t])