diff --git a/collects/framework/frame.ss b/collects/framework/frame.ss
index b5716824..d1f8aaa4 100644
--- a/collects/framework/frame.ss
+++ b/collects/framework/frame.ss
@@ -716,7 +716,7 @@
 	  (lambda (p v)
 	    (if v 
 		(register-gc-blit)
-		(unregister-collecting-blit gc-canvas))
+		'(unregister-collecting-blit gc-canvas))
 	    (send super-root change-children
 		  (lambda (l)
 		    (if v
@@ -727,7 +727,7 @@
 	 (lambda ()
 	   (super-on-close)
 	   (send time-canvas set-editor #f)
-	   (unregister-collecting-blit gc-canvas)
+	   '(unregister-collecting-blit gc-canvas)
 	   (close-panel-callback))])
       
       (inherit get-editor)
@@ -785,7 +785,7 @@
 		 [offb (icon:get-gc-off-bitmap)])
 	     (when (and (send onb ok?)
 			(send offb ok?))
-	       (register-collecting-blit gc-canvas 
+	       '(register-collecting-blit gc-canvas 
 					 0 0
 					 (send onb get-width)
 					 (send onb get-height)
@@ -805,9 +805,9 @@
 	       [gc-height (if (send gcb ok?)
 			      (send gcb get-height)
 			      10)])
-	  '(send* gc-canvas
-		  (min-client-width gc-width)
-		  (min-client-height gc-height)
+	  (send* gc-canvas
+		  (min-client-width (max (send gc-canvas min-width) gc-width))
+		  (min-client-height (max (send gc-canvas min-height) gc-height))
 		  (stretchable-width #f)
 		  (stretchable-height #f)))
 	(send* (get-info-panel) 
diff --git a/collects/framework/text.ss b/collects/framework/text.ss
index 65df52b4..84cc0295 100644
--- a/collects/framework/text.ss
+++ b/collects/framework/text.ss
@@ -405,11 +405,12 @@
       (override
 	[on-local-char
 	 (lambda (key)
-	   (let ([cr-code 13]
-		 [lf-code 10]
+	   (let ([cr-code #\return]
+		 [lf-code #\newline]
 		 [code (send key get-key-code)])
-	     (or (and (or (= lf-code code)
-			  (= cr-code code))
+	     (or (and (char? code)
+		      (or (char=? lf-code code)
+			  (char=? cr-code code))
 		      (return))
 		 (super-on-local-char key))))])
       (sequence