diff --git a/racket/collects/racket/fasl.rkt b/racket/collects/racket/fasl.rkt
index 458d57eb2c..683253e00e 100644
--- a/racket/collects/racket/fasl.rkt
+++ b/racket/collects/racket/fasl.rkt
@@ -594,7 +594,7 @@
 
 (define (read-byte/no-eof i)
   (define pos (mcdr i))
-  (unless (pos . < . (bytes-length (mcar i)))
+  (unless (pos . fx< . (bytes-length (mcar i)))
     (read-error "truncated stream"))
   (set-mcdr! i (fx+ pos 1))
   (bytes-ref (mcar i) pos))
diff --git a/racket/src/cs/rumble/keyword.ss b/racket/src/cs/rumble/keyword.ss
index ff5bc90d2e..89728a9c8f 100644
--- a/racket/src/cs/rumble/keyword.ss
+++ b/racket/src/cs/rumble/keyword.ss
@@ -4,17 +4,16 @@
   (sealed #t)
   (nongenerative #{keyword dhghafpy3v03qbye1a9lwf-0}))
 
-(define keywords (make-weak-eq-hashtable))
+(define keywords (make-ephemeron-eq-hashtable))
 
 (define/who (string->keyword s)
   (check who string? s)
   (let ([sym (string->symbol s)])
     (with-global-lock
-     (let ([e (eq-hashtable-ref keywords sym #f)])
-       (or (and e
-                (ephemeron-value e))
+     (let ([kw (eq-hashtable-ref keywords sym #f)])
+       (or kw
            (let ([kw (make-keyword sym)])
-             (eq-hashtable-set! keywords sym (make-ephemeron sym kw))
+             (eq-hashtable-set! keywords sym kw)
              kw))))))
 
 (define/who (keyword->string kw)
diff --git a/racket/src/cs/schemified/expander.scm b/racket/src/cs/schemified/expander.scm
index 88f32ab06b..9858d6c2a2 100644
--- a/racket/src/cs/schemified/expander.scm
+++ b/racket/src/cs/schemified/expander.scm
@@ -25307,7 +25307,7 @@
   (lambda (i_0)
     (let ((pos_0 (unsafe-mcdr i_0)))
       (begin
-        (if (< pos_0 (unsafe-bytes-length (unsafe-mcar i_0)))
+        (if (fx< pos_0 (unsafe-bytes-length (unsafe-mcar i_0)))
           (void)
           (read-error "truncated stream"))
         (unsafe-set-mcdr! i_0 (fx+ pos_0 1))
diff --git a/racket/src/cs/schemified/schemify.scm b/racket/src/cs/schemified/schemify.scm
index ffea7335e6..dabe9e7388 100644
--- a/racket/src/cs/schemified/schemify.scm
+++ b/racket/src/cs/schemified/schemify.scm
@@ -48702,7 +48702,7 @@
   (lambda (i_0)
     (let ((pos_0 (unsafe-mcdr i_0)))
       (begin
-        (if (< pos_0 (unsafe-bytes-length (unsafe-mcar i_0)))
+        (if (fx< pos_0 (unsafe-bytes-length (unsafe-mcar i_0)))
           (void)
           (read-error "truncated stream"))
         (unsafe-set-mcdr! i_0 (fx+ pos_0 1))