diff --git a/sys/libnh/libnhmain.c b/sys/libnh/libnhmain.c
index 631b9152c..7d9ddf3e1 100644
--- a/sys/libnh/libnhmain.c
+++ b/sys/libnh/libnhmain.c
@@ -295,7 +295,7 @@ nhmain(int argc, char *argv[])
             wd_message();
             if (discover || wizard) {
                 /* this seems like a candidate for paranoid_confirmation... */
-                if (yn("Do you want to keep the save file?") == 'n') {
+                if (y_n("Do you want to keep the save file?") == 'n') {
                     (void) delete_savefile();
                 } else {
                     (void) chmod(fq_save, FCMASK); /* back to readable */
diff --git a/win/shim/winshim.c b/win/shim/winshim.c
index c06cda2bd..d83c62a45 100644
--- a/win/shim/winshim.c
+++ b/win/shim/winshim.c
@@ -131,7 +131,7 @@ VDECLCB(shim_display_file,(const char *name, boolean complain), "vsi", P2V name,
 VDECLCB(shim_start_menu,(winid window, unsigned long mbehavior), "vii", A2P window, A2P mbehavior)
 VDECLCB(shim_add_menu,
     (winid window, const glyph_info *glyphinfo, const ANY_P *identifier, char ch, char gch, int attr, int clr, const char *str, unsigned int itemflags),
-    "vippiiisi",
+    "vippiiiisi",
     A2P window, P2V glyphinfo, P2V identifier, A2P ch, A2P gch, A2P attr, A2P clr, P2V str, A2P itemflags)
 VDECLCB(shim_end_menu,(winid window, const char *prompt), "vis", A2P window, P2V prompt)
 /* XXX: shim_select_menu menu_list is an output */
@@ -186,7 +186,7 @@ void shim_update_inventory(int a1 UNUSED) {
 win_request_info *
 shim_ctrl_nhwindow(
     winid window UNUSED,
-    int request,
+    int request UNUSED,
     win_request_info *wri UNUSED) {
     return (win_request_info *) 0;
 }