diff --git a/STM32F072xB.ld b/STM32F072xB.ld
index 8f7b034..b6fd84f 100644
--- a/STM32F072xB.ld
+++ b/STM32F072xB.ld
@@ -19,14 +19,14 @@
  */
 MEMORY
 {
-    flash0  : org = 0x08000000, len = 108k
+    flash0  : org = 0x08000000, len = 116k
     flash1  : org = 0x00000000, len = 0
     flash2  : org = 0x00000000, len = 0
     flash3  : org = 0x00000000, len = 0
     flash4  : org = 0x00000000, len = 0
     flash5  : org = 0x00000000, len = 0
     flash6  : org = 0x00000000, len = 0
-    flash7  : org = 0x0801B000, len = 20k
+    flash7  : org = 0x0801B000, len = 12k
     ram0    : org = 0x20000000, len = 16k
     ram1    : org = 0x00000000, len = 0
     ram2    : org = 0x00000000, len = 0
diff --git a/flash.c b/flash.c
index fd8accf..4d50df5 100644
--- a/flash.c
+++ b/flash.c
@@ -222,8 +222,7 @@ caldata_recall(uint16_t id)
   memcpy(dst, src, sizeof(setting_t));
   // Restore stored trace
   src = &(src[1]);
-  volatile void *dst2 = stored_t;
-  memcpy(dst2, src, sizeof(stored_t));
+  memcpy(stored_t, src, sizeof(stored_t));
   update_min_max_freq();
   update_frequencies();
   set_scale(setting.scale);
diff --git a/main.c b/main.c
index 937a208..d1be586 100644
--- a/main.c
+++ b/main.c
@@ -1497,11 +1497,11 @@ VNA_SHELL_FUNCTION(cmd_marker)
   }
 #ifdef TINYSA4
   static const char cmd_marker_list[] = "on|off|peak|delta|noise|tracking|stored|trace_aver";
+  static const char cmd_marker_on_off[] = "off|on";
+  int marker_mask = 0;
 #else
   static const char cmd_marker_list[] = "on|off|peak";
 #endif
-  static const char cmd_marker_on_off[] = "off|on";
-  int marker_mask = 0;
   switch (get_str_index(argv[1], cmd_marker_list)) {
     case 0: markers[t].enabled = TRUE; active_marker = t; return;
     case 1: markers[t].enabled =FALSE; if (active_marker == t) active_marker = MARKER_INVALID; return;
diff --git a/nanovna.h b/nanovna.h
index a23ae5c..2cfdd27 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -1084,13 +1084,13 @@ extern int linear_averaging;
 #ifdef TINYSA4
 #define SAVEAREA_MAX 5
 #else
-#define SAVEAREA_MAX 9
+#define SAVEAREA_MAX 5
 #endif
 // STM32 minimum page size for write
 #define FLASH_PAGESIZE          0x800
 // config save area (flash7 addr)
 #ifdef TINYSA3
-#define SAVE_CONFIG_ADDR        0x0801B000
+#define SAVE_CONFIG_ADDR        0x0801D000
 #endif
 
 #ifdef TINYSA4
diff --git a/ui_sa.c b/ui_sa.c
index 4c4e3c9..63e502c 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -1457,6 +1457,7 @@ validate:
 
 //  selection = -1;
   ui_mode_normal();
+  goto leave;       // to get rid of warning
 leave:
   set_measurement(data);
 //  draw_cal_status();