diff --git a/racket/src/expander/common/module-path.rkt b/racket/src/expander/common/module-path.rkt
index eca500d50d..60046ff32f 100644
--- a/racket/src/expander/common/module-path.rkt
+++ b/racket/src/expander/common/module-path.rkt
@@ -167,7 +167,7 @@
                                          (eq? 'submod (car v)))
                                     (format-submod (loop (cadr v)) (cddr v))]
                                    [else
-                                    (format "~.s" (module-path-index-path r))]))
+                                    (format "~.s" v)]))
                                 (loop (module-path-index-base r)))]
                          [(module-path-index-resolved r)
                           (list
diff --git a/racket/src/expander/expand/module.rkt b/racket/src/expander/expand/module.rkt
index f6c7ba035b..5179bf146a 100644
--- a/racket/src/expander/expand/module.rkt
+++ b/racket/src/expander/expand/module.rkt
@@ -472,8 +472,8 @@
    
    (define mb-scopes-s
      (if keep-enclosing-scope-at-phase
-         ;; for `(module* name #f)`, use the `(module* ...)` form
-         disarmed-s
+         ;; for `(module* name #f)`, use the `(module* ...)` form:
+         (apply-module-scopes disarmed-s)
          ;; otherwise, use the initial require
          all-scopes-s))
 
diff --git a/racket/src/racket/src/startup.inc b/racket/src/racket/src/startup.inc
index 5a4298b44b..25df0a6875 100644
--- a/racket/src/racket/src/startup.inc
+++ b/racket/src/racket/src/startup.inc
@@ -3952,8 +3952,7 @@ static const char *startup_source =
 "(let-values()"
 "(format"
 "                                                                                                           \"~.s\""
-"(module-path-index-path"
-" r_13)))))))))"
+" v_40))))))))"
 " loop_57)"
 "(module-path-index-path r_13))"
 "(loop_56(module-path-index-base r_13))))"
@@ -72378,7 +72377,8 @@ static const char *startup_source =
 " the-struct_104))))))"
 "(let-values(((mb-scopes-s_0)"
 "(if keep-enclosing-scope-at-phase_0"
-" disarmed-s_24"
+"(apply-module-scopes_0"
+" disarmed-s_24)"
 " all-scopes-s_0)))"
 "(let-values(((mb-def-ctx-scopes_0)"
 "(box"