diff --git a/grid.c b/grid.c
index 3beaf0f1..0fde6f62 100644
--- a/grid.c
+++ b/grid.c
@@ -39,7 +39,7 @@
 const struct grid_cell grid_default_cell = {
 	0, 0, 8, 8, { { ' ' }, 0, 1, 1 }
 };
-const struct grid_cell_entry grid_default_entry = {
+static const struct grid_cell_entry grid_default_entry = {
 	0, { .data = { 0, 8, 8, ' ' } }
 };
 
diff --git a/key-string.c b/key-string.c
index b1329c1a..dc09ed98 100644
--- a/key-string.c
+++ b/key-string.c
@@ -232,7 +232,7 @@ key_string_lookup_string(const char *string)
 const char *
 key_string_lookup_key(key_code key)
 {
-	static char		out[24];
+	static char		out[32];
 	char			tmp[8];
 	u_int			i;
 	struct utf8_data	ud;
diff --git a/window.c b/window.c
index ed4d3c5d..ab6f35f5 100644
--- a/window.c
+++ b/window.c
@@ -1506,6 +1506,7 @@ winlink_clear_flags(struct winlink *wl)
 	}
 }
 
+/* Shuffle window indexes up. */
 int
 winlink_shuffle_up(struct session *s, struct winlink *wl)
 {