diff --git a/ChangeLog b/ChangeLog
index 0075fe431892d35798975b08314865b5f6d99716..c9bec626fe080575361e7c015632dae99b7d992f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,13 @@ CVS code -
 - nano.c:
   main()
 	- Change the getop option to 'F' (David Lawrence Ramsey)
+- nano.h:
+	- Fix type in INSERTFILE_LIST_LEN.
 - rcfile.c:
 	- Update for the multibuffer option (oops) (David Lawrence Ramsey).
+- search.c:
+  search_init()
+	- add #ifdef NANO_SMALL around toggles code.
 
 nano-1.1.0 - 07/15/2001
 - General
diff --git a/nano.h b/nano.h
index bca145a4155312107cfc9cb503107062ba371b6a..c3d05759a7294c2100d62c018cc39b4f2c909b15 100644
--- a/nano.h
+++ b/nano.h
@@ -312,7 +312,7 @@ know what you're doing */
 #define BROWSER_LIST_LEN 4
 #else
 #define WRITEFILE_LIST_LEN 3
-#define IMSERTFILE_LIST_LEN 1
+#define INSERTFILE_LIST_LEN 1
 #endif
 
 #define VIEW 1
diff --git a/search.c b/search.c
index b6d1bf197d0bb97b0c90cf9ec6b42a638232f2a9..8a2dd4300c12b3702a8b74474767178439cc0478 100644
--- a/search.c
+++ b/search.c
@@ -72,10 +72,13 @@ void search_init_globals(void)
 */
 int search_init(int replacing)
 {
-    int i = 0, j;
+    int i = 0;
     char *buf;
     char *prompt;
     static char *backupstring = NULL;
+#ifndef NANO_SMALL
+    int j;
+#endif
 
     search_init_globals();
 
@@ -170,9 +173,11 @@ int search_init(int replacing)
 	backupstring = NULL;
 	backupstring = mallocstrcpy(backupstring, answer);
 
+#ifndef NANO_SMALL
 	for (j = 0; j <= TOGGLE_LEN - 1; j++)
 	    if (i == toggles[j].val)
 		TOGGLE(toggles[j].flag);
+#endif
 
 	return 1;
     case NANO_OTHERSEARCH_KEY: