diff --git a/collects/drscheme/private/auto-language.rkt b/collects/drscheme/private/auto-language.rkt
index 97691ac3b2..1b1c4c3081 100644
--- a/collects/drscheme/private/auto-language.rkt
+++ b/collects/drscheme/private/auto-language.rkt
@@ -80,4 +80,4 @@
                ;; If tp contains a snip, read-line fails.
                (read-line tp))])
     (and (string? l1)
-         (regexp-match? #rx"#lang .*$" l1))))
+         (regexp-match? #rx"#lang .*$" (assert l1 string?)))))
diff --git a/collects/drscheme/private/insert-large-letters.rkt b/collects/drscheme/private/insert-large-letters.rkt
index 406cd64032..d53ca59fa1 100644
--- a/collects/drscheme/private/insert-large-letters.rkt
+++ b/collects/drscheme/private/insert-large-letters.rkt
@@ -1,4 +1,4 @@
-#lang typed/scheme/base ;/no-check
+#lang typed/scheme/base
 
 (require typed/mred/mred
          typed/framework/framework
@@ -11,7 +11,7 @@
                                           ([set-bm ((Instance Bitmap%) -> Void)])))
 
 
-(require/typed "bitmap-message.ss"
+(require/typed "bitmap-message.rkt"
                [bitmap-message% Bitmap-Message%])
 
 (provide insert-large-letters)
@@ -23,8 +23,8 @@
                (not (equal? str "")))
       (render-large-letters comment-prefix comment-character (get-chosen-font) str edit)
       (void))))
-
-(preferences:set-default 'drscheme:large-letters-font #f (λ: ([x : Any])
+#;
+(preferences:set-default 'drracket:large-letters-font #f (λ: ([x : Any])
                                                              (or (and (pair? x)
                                                                       (string? (car x))
                                                                       (let ([i (cdr x)])
@@ -41,7 +41,7 @@
 
 (: get-chosen-font (-> (Instance Font%)))
 (define (get-chosen-font)
-  (let ([pref-val (preferences:get 'drscheme:large-letters-font)])
+  (let ([pref-val (preferences:get 'drracket:large-letters-font)])
     (cond
       [pref-val
        (let ([candidate (send the-font-list find-or-create-font (cdr pref-val) (car pref-val) 'default 'normal 'normal)])
@@ -78,10 +78,10 @@
                          (get-face-list))]
            [callback
             (λ: ([x : Any] [y : Any])
-                (let ([old (preferences:get 'drscheme:large-letters-font)]
+                (let ([old (preferences:get 'drracket:large-letters-font)]
                       [choice (send font-choice get-selection)])
                   (when choice
-                    (preferences:set 'drscheme:large-letters-font
+                    (preferences:set 'drracket:large-letters-font
                                      (cons (list-ref (get-face-list)
                                                      choice)
                                            (if old
diff --git a/collects/typed/framework/framework.rkt b/collects/typed/framework/framework.rkt
index f5341ed57c..701d5959fa 100644
--- a/collects/typed/framework/framework.rkt
+++ b/collects/typed/framework/framework.rkt
@@ -34,9 +34,9 @@
  [gui-utils:ok/cancel-buttons 
   ((Instance Horizontal-Panel%) ((Instance Button%) (Instance Event%) -> Void) ((Instance Button%) (Instance Event%) -> Void) -> (values Any Any))])
 
-(require/typed/provide "prefs-contract.ss"
+(require/typed/provide "prefs-contract.rkt"
                        [preferences:get-drracket:large-letters-font (-> (U #f (Pair String Integer)))])
 
-(require (only-in "prefs-contract.ss" preferences:get))
+(require (only-in "prefs-contract.rkt" preferences:get))
 (provide preferences:get)