diff --git a/collects/racket/draw/private/dc.rkt b/collects/racket/draw/private/dc.rkt
index 57052a1f2b..60404f2ad3 100644
--- a/collects/racket/draw/private/dc.rkt
+++ b/collects/racket/draw/private/dc.rkt
@@ -1522,7 +1522,7 @@
                                                           (/ (PangoRectangle-width logical) 
                                                              (exact->inexact PANGO_SCALE)))]
                                                      [flh (/ orig-h (exact->inexact PANGO_SCALE))]
-                                                     [ld (/ (- orig-h baseline) (exact->inexact PANGO_SCALE))]
+                                                     [ld (exact->inexact (/ (- orig-h baseline) (exact->inexact PANGO_SCALE)))]
                                                      [la 0.0])
                                                  (let ([lh (ceiling flh)])
                                                    (when cache
diff --git a/collects/racket/draw/unsafe/pango.rkt b/collects/racket/draw/unsafe/pango.rkt
index 5963915fad..8ed6b588fa 100644
--- a/collects/racket/draw/unsafe/pango.rkt
+++ b/collects/racket/draw/unsafe/pango.rkt
@@ -85,7 +85,7 @@
    ;; Inline PangoAnalysis:
    [shape_engine _pointer]
    [lang_engine _pointer]
-   [font PangoFont]
+   [font (_or-null PangoFont)]
    [level _uint8]
    [gravity _uint8]
    [flags _uint8]