diff --git a/collects/mred/mred.ss b/collects/mred/mred.ss
index 937cd732..1e45e27a 100644
--- a/collects/mred/mred.ss
+++ b/collects/mred/mred.ss
@@ -3526,6 +3526,8 @@
       (unless multi? (send c set-single-line))
 
       (when (and l horiz?)
+	;; Minimize vertical space around the label:
+	(send l y-margin 0)
 	;; Find amount to drop label down to line up the baselines:
 	(let ([wbox (box 0)]
 	      [hbox (box 0)]
@@ -7813,7 +7815,10 @@
 			    #f))
 			 ns)])
 	   (syntax (begin
-		     (provide (rename k:n n) ...)))))])))
+		     ;; We can't just re-export, because kernel.ss's
+		     ;;  exports are protected.
+		     (define n k:n) ...
+		     (provide n ...)))))])))
 
 (propagate add-color<%>
 	   add-editor-keymap-functions
diff --git a/collects/mred/private/kernel.ss b/collects/mred/private/kernel.ss
index 7ef48528..5160a1f2 100644
--- a/collects/mred/private/kernel.ss
+++ b/collects/mred/private/kernel.ss
@@ -29,7 +29,7 @@
 	   (syntax
 	    (begin
 	      (define kernel:name (dynamic-require '#%mred-kernel 'name))
-	      (provide (rename kernel:name name)))))])))
+	      (provide (protect (rename kernel:name name))))))])))
 
   (define-syntax define-function
     (lambda (stx)
@@ -99,7 +99,7 @@
 	 (syntax
 	  (begin 
 	    (define-a-class name name super args id ...)
-	    (provide name)))])))
+	    (provide (protect name))))])))
 
   (define-syntax define-private-class
     (lambda (stx)
@@ -109,7 +109,7 @@
 	  (begin 
 	    (define-a-class name intf super args id ...)
 	    (define intf (class->interface name))
-	    (provide intf)))])))
+	    (provide (protect intf))))])))
   (define-class object% #f #f)
   (define-class window% object% #f
     on-drop-file