diff --git a/games/number/number.c b/games/number/number.c
index e6ef2910163..c7dfbe424a0 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -56,7 +56,7 @@ static const char rcsid[] =
 
 #define	MAXNUM		65		/* Biggest number we handle. */
 
-static char	*name1[] = {
+static const char	*name1[] = {
 	"",		"one",		"two",		"three",
 	"four",		"five",		"six",		"seven",
 	"eight",	"nine",		"ten",		"eleven",
@@ -133,6 +133,7 @@ convert(line)
 	int flen, len, rval;
 	char *p, *fraction;
 
+	flen = NULL;
 	fraction = NULL;
 	for (p = line; *p != '\0' && *p != '\n'; ++p) {
 		if (isblank(*p)) {
@@ -163,7 +164,7 @@ badnum:			errx(1, "illegal number: %s", line);
 	*p = '\0';
 
 	if ((len = strlen(line)) > MAXNUM ||
-	    fraction != NULL && (flen = strlen(fraction)) > MAXNUM)
+	    (fraction != NULL && ((flen = strlen(fraction)) > MAXNUM)))
 		errx(1, "number too large, max %d digits.", MAXNUM);
 
 	if (*line == '-') {
diff --git a/games/piano/piano.c b/games/piano/piano.c
index 2706d1091cb..664f4341375 100644
--- a/games/piano/piano.c
+++ b/games/piano/piano.c
@@ -1,7 +1,7 @@
 /*
  * piano.c - a piano emulator
  */
-static char rcsid[] =
+static const char rcsid[] =
   "$FreeBSD$";
 #include <stdio.h>
 #include <stdlib.h>
@@ -136,8 +136,6 @@ nain(void)
 int
 main(int argc, char *argv[])
 {
-	extern char *optarg;
-	extern int optind, opterr;
 	int ch, ex, show_usage = 0;
 	myname = argv[0];
 	while ((ch = getopt(argc, argv, "-vi:")) != -1) {