diff --git a/search.c b/search.c
index df2f53aa..39711242 100644
--- a/search.c
+++ b/search.c
@@ -145,7 +145,9 @@ int search_init(int replacing)
 /* NEW TEST */
     if (ISSET(PICO_MODE)) {
 	backupstring = mallocstrcpy(backupstring, "");
+#ifndef NANO_SMALL
 	search_history.current = (historytype *)&search_history.next;
+#endif
     }
 /* */
     /* If using Pico messages, we do things the old fashioned way... */
diff --git a/winio.c b/winio.c
index d6d74304..87f0dfe8 100644
--- a/winio.c
+++ b/winio.c
@@ -456,7 +456,9 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
 	    fprintf(stderr, _("input \'%c\' (%d)\n"), kbinput, kbinput);
 #endif
 	} /* switch (kbinput) */
+#ifndef NANO_SMALL
 	last_kbinput = kbinput;
+#endif
 	nanoget_repaint(buf, answer, x);
 	wrefresh(bottomwin);
     } /* while (kbinput ...) */
@@ -551,10 +553,10 @@ void bottombars(const shortcut *s)
 
 	    wmove(bottomwin, 1 + j, i * (COLS / numcols));
 
-#ifndef NANO_SMALL
 	    /* Yucky sentinel values we can't handle a better way */
 	    if (s->val == NANO_CONTROL_SPACE)
 		strcpy(keystr, "^ ");
+#ifndef NANO_SMALL
 	    else if (s->val == KEY_UP)
 		strcpy(keystr, _("Up"));
 #endif /* NANO_SMALL */