diff --git a/sys/amiga/winami.c b/sys/amiga/winami.c
index 19a660e42..edd1b5d15 100644
--- a/sys/amiga/winami.c
+++ b/sys/amiga/winami.c
@@ -499,7 +499,8 @@ amii_get_ext_cmd(void)
                 sel = com_index;
             } else {
                 colx = put_ext_cmd(obufp, colx, cw, bottom);
-                if (bufp - obufp < BUFSZ - 1 && bufp - obufp < COLNO)
+                if (bufp - obufp < (int) sizeof obufp - 1
+                    && bufp - obufp < COLNO)
                     bufp++;
             }
         } else if (c == ('X' - 64) || c == '\177') {
diff --git a/sys/amiga/winfuncs.c b/sys/amiga/winfuncs.c
index 9b172201d..f2ffdb641 100644
--- a/sys/amiga/winfuncs.c
+++ b/sys/amiga/winfuncs.c
@@ -1732,7 +1732,7 @@ amii_set_text_font(char *name, int size)
 
     /* Look for windows to set, and change them */
 
-    if (DiskfontBase = OpenLibrary("diskfont.library", amii_libvers)) {
+    if ((DiskfontBase = OpenLibrary("diskfont.library", amii_libvers))) {
         TextsFont = OpenDiskFont(&TextsFont13);
         for (i = 0; TextsFont && i < MAXWIN; ++i) {
             if ((cw = amii_wins[i]) && cw->win != NULL) {
@@ -1751,9 +1751,9 @@ amii_set_text_font(char *name, int size)
                 }
             }
         }
+        CloseLibrary(DiskfontBase);
+        DiskfontBase = NULL;
     }
-    CloseLibrary(DiskfontBase);
-    DiskfontBase = NULL;
 }
 
 void