diff --git a/main.c b/main.c
index 28aac45..f45fc13 100644
--- a/main.c
+++ b/main.c
@@ -2316,13 +2316,18 @@ VNA_SHELL_FUNCTION(cmd_info)
   (void)argc;
   (void)argv;
   int i = 0;
+#ifdef TINYSA3
   while (info_about[i]) {
-    shell_printf("%s%s\r\n", info_about[i], (i == 0 ? hw_text : ""));
+    shell_printf("%s\r\n", info_about[i]);
     i++;
   }
-#ifdef TINYSA3
   if (has_esd)
     shell_printf("ESD protected\r\n");
+#else
+  while (info_about[i]) {
+    shell_printf("%s%s\r\n", info_about[i], (i == 0 ? hw_text : ""));
+    i++;
+  }
 #endif
 }
 #endif
diff --git a/sa_cmd.c b/sa_cmd.c
index 2d72b83..19c3b8c 100644
--- a/sa_cmd.c
+++ b/sa_cmd.c
@@ -610,10 +610,10 @@ VNA_SHELL_FUNCTION(cmd_if)
 #ifdef TINYSA4
   if (hw_if)
     t = "1067M..1073M";
-  usage_printf("usage: if {%s}\r\n%QHz\r\n", t, setting.frequency_IF);
 #else
-    usage_printf("usage: if {433M..435M}\r\n%QHz\r\n", setting.frequency_IF);
+    t = "433M..435M";
 #endif
+  usage_printf("usage: if {%s}\r\n%QHz\r\n", t, setting.frequency_IF);
     return;
   }
   freq_t a = (freq_t)my_atoi(argv[0]);
diff --git a/ui.c b/ui.c
index dd564cc..1770d75 100644
--- a/ui.c
+++ b/ui.c
@@ -6451,7 +6451,7 @@ redraw_cal_status:
   // Compact status string
 //  ili9341_set_background(LCD_FG_COLOR);
   ili9341_set_foreground(LCD_FG_COLOR);
-  strncpy(buf,"      ",BLEN-1);
+  strncpy(buf,"      ",BLEN);
   if (setting.auto_IF)
     buf[0] = 'f';
   else