diff --git a/build_tools/menuselect.c b/build_tools/menuselect.c
index b3400ffb82..9705af7fdc 100644
--- a/build_tools/menuselect.c
+++ b/build_tools/menuselect.c
@@ -633,6 +633,7 @@ static int sanity_check(void)
 			}
 		}
 	}
+	return 0;	/* all good... */
 }
 
 /* \brief Set the forced default values if they exist */
@@ -725,5 +726,6 @@ int main(int argc, char *argv[])
 	if (force_clean)
 		unlink(".lastclean");
 
+	fprintf(stderr, "\nmenuselect about to exit with res %d\n", res);
 	exit(res);
 }
diff --git a/build_tools/menuselect_curses.c b/build_tools/menuselect_curses.c
index 13fc86eb5e..d8bedc2024 100644
--- a/build_tools/menuselect_curses.c
+++ b/build_tools/menuselect_curses.c
@@ -128,7 +128,7 @@ void draw_category_menu(WINDOW *menu, struct category *cat, int start, int end,
 	int j = 0;
 	struct member *mem;
 	char buf[64];
-	char *desc = NULL;
+	const char *desc = NULL;
 
 	wclear(menu);