diff --git a/racket/src/io/network/tcp-listen.rkt b/racket/src/io/network/tcp-listen.rkt
index bb2c611c88..bc9b4807e8 100644
--- a/racket/src/io/network/tcp-listen.rkt
+++ b/racket/src/io/network/tcp-listen.rkt
@@ -4,6 +4,7 @@
          "../host/rktio.rkt"
          "../security/main.rkt"
          "../sandman/main.rkt"
+         "../format/main.rkt"
          "port-number.rkt"
          "address.rkt"
          "error.rkt")
diff --git a/racket/src/io/port/fd-port.rkt b/racket/src/io/port/fd-port.rkt
index 6be1f68845..e2f2d4fac8 100644
--- a/racket/src/io/port/fd-port.rkt
+++ b/racket/src/io/port/fd-port.rkt
@@ -432,9 +432,9 @@
 
 (define (register-fd-close custodian fd fd-refcount flush-handle port)
   (unsafe-custodian-register custodian
-                             fd
+                             port
                              ;; in atomic mode
-                             (lambda (fd)
+                             (lambda (port)
                                (when flush-handle
                                  (plumber-flush-handle-remove! flush-handle))
                                (if (input-port? port)