diff --git a/collects/framework/private/exit.ss b/collects/framework/private/exit.ss
index 6dcc9991..dd4ca154 100644
--- a/collects/framework/private/exit.ss
+++ b/collects/framework/private/exit.ss
@@ -55,18 +55,17 @@
 
       (define (user-oks-exit)
 	(if (preferences:get 'framework:verify-exit)
-	    (let*-values ([(w capw)
-			   (if (eq? (system-type) 'windows)
-			       (values (string-constant exit-lc) (string-constant exit-cap))
-			       (values (string-constant quit-lc) (string-constant quit-cap)))]
-			  [(message)
-			   (format (string-constant are-you-sure-format) w)]
-			  [(user-says) (gui-utils:get-choice message capw
-                                                             (string-constant cancel)
-                                                             (string-constant warning)
-                                                             #f
-							     (frame-exiting))])
-	      user-says)
+	    (gui-utils:get-choice
+	     (if (eq? (system-type) 'windows)
+		 (string-constant are-you-sure-exit)
+		 (string-constant are-you-sure-quit))
+	     (if (eq? (system-type) 'windows)
+		 (string-constant exit)
+		 (string-constant quit))
+	     (string-constant cancel)
+	     (string-constant warning)
+	     #f
+	     (frame-exiting))
 	    #t))
 
       (define -exit
diff --git a/collects/framework/private/menu.ss b/collects/framework/private/menu.ss
index 64910997..9baa9140 100644
--- a/collects/framework/private/menu.ss
+++ b/collects/framework/private/menu.ss
@@ -2,7 +2,7 @@
   (require (lib "unitsig.ss")
 	   (lib "class.ss")
 	   (lib "class100.ss")
-	   "sig"
+	   "sig.ss"
 	   "../macro.ss"
 	   (lib "mred-sig.ss" "mred"))
   
diff --git a/collects/framework/private/version.ss b/collects/framework/private/version.ss
index 48f046a0..bb59f3b8 100644
--- a/collects/framework/private/version.ss
+++ b/collects/framework/private/version.ss
@@ -1,6 +1,6 @@
 (module version mzscheme
   (require (lib "unitsig.ss")
-	   "sig"
+	   "sig.ss"
 	   (lib "mred-sig.ss" "mred")
 	   (lib "string.ss")
 	   (lib "list.ss"))