diff --git a/collects/handin-server/sandbox.ss b/collects/handin-server/sandbox.ss
index 1f697e3fa2..a1f972fd08 100644
--- a/collects/handin-server/sandbox.ss
+++ b/collects/handin-server/sandbox.ss
@@ -1,26 +1,24 @@
-(module sandbox mzscheme
-  (require (lib "sandbox.ss"))
-  (provide (all-from (lib "sandbox.ss")))
+#lang scheme/base
+(require scheme/sandbox)
+(provide (all-from-out scheme/sandbox))
 
-  ;; no input/output
-  (sandbox-input        #f)
-  (sandbox-output       #f)
-  (sandbox-error-output #f)
+;; no input/output
+(sandbox-input        #f)
+(sandbox-output       #f)
+(sandbox-error-output #f)
 
-  ;; no limits -- the handin server uses per-session limits
-  (sandbox-eval-limits #f)
+;; no limits -- the handin server uses per-session limits
+(sandbox-eval-limits #f)
 
-  ;; share these with evaluators
-  (sandbox-namespace-specs
-   (let ([specs (sandbox-namespace-specs)])
-     `(,(car specs)
-       ,@(cdr specs)
-       (lib "posn.ss" "lang")
-       ,@(if mred? '((lib "cache-image-snip.ss" "mrlib")) '()))))
+;; share these with evaluators
+(sandbox-namespace-specs
+ (let ([specs (sandbox-namespace-specs)])
+   `(,(car specs)
+     ,@(cdr specs)
+     lang/posn
+     ,@(if gui? '(mrlib/cache-image-snip) '()))))
 
-  ;; local overrides
-  (sandbox-override-collection-paths
-   (cons (build-path (collection-path "handin-server") "overridden-collects")
-         (sandbox-override-collection-paths)))
-
-  )
+;; local overrides
+(sandbox-override-collection-paths
+ (cons (build-path (collection-path "handin-server") "overridden-collects")
+       (sandbox-override-collection-paths)))
diff --git a/collects/handin-server/scribblings/handin-server.scrbl b/collects/handin-server/scribblings/handin-server.scrbl
index 38aa96a091..803c4c4291 100644
--- a/collects/handin-server/scribblings/handin-server.scrbl
+++ b/collects/handin-server/scribblings/handin-server.scrbl
@@ -27,11 +27,11 @@
 
 @section{Handin-Server and Client}
 
-The @scheme[handin-server] directory contains a server to be run by a
+The @filepath[handin-server] directory contains a server to be run by a
 course instructor for accepting homework assignments and reporting on
 submitted assignments.
 
-The @scheme[handin-client] directory contains a client to be
+The @filepath[handin-client] directory contains a client to be
 customized then re-distributed to students in the course.  The
 customized client will embed a particular hostname and port where the
 server is running, as well as a server certificate.