diff --git a/plot.c b/plot.c
index 3ebbd67..6bab64c 100644
--- a/plot.c
+++ b/plot.c
@@ -382,9 +382,9 @@ to_dBm(const float v)
   switch(setting.unit)
   {
   case U_DBMV:
-    return v - (30.0 - 20.0*log10f(sqrtf(50.0)));
+    return v - (30.0 + 20.0*log10f(sqrtf(50.0)));
   case U_DBUV:
-    return v - (90.0 - 20.0*log10f(sqrtf(50.0)));
+    return v - (90.0 + 20.0*log10f(sqrtf(50.0)));
   case U_VOLT:
 //  return log10f(v/(sqrtf(50.0)))* 20.0             + 30.0;
     return   logf(v/(sqrtf(50.0)))*(20.0/logf(10.0)) + 30.0;
diff --git a/sa_core.c b/sa_core.c
index e96ce52..84b260a 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -245,9 +245,11 @@ void reset_settings(int m)
   }
   for (int l=0;l<LIMITS_MAX;l++)
     setting.limits[l].enabled = false;
-  if (in_selftest)
+  if (in_selftest) {
     setting.stored[TRACE_STORED] = true;
-  TRACE_DISABLE(TRACE_STORED_FLAG|TRACE_TEMP_FLAG);
+    TRACE_ENABLE(TRACE_STORED_FLAG);
+  } else
+    TRACE_DISABLE(TRACE_STORED_FLAG|TRACE_TEMP_FLAG);
 #ifdef TINYSA4  
   setting.harmonic = 3;         // Automatically used when above ULTRA_MAX_FREQ
 #else
@@ -938,10 +940,10 @@ void limits_update(void)
   {
     while (j < sweep_points)
       stored_t[j++] = setting.limits[prev].level;
-    setting.show_stored = true;
+    setting.stored[TRACE_STORED] = true;
     TRACE_ENABLE(TRACE_STORED_FLAG);
   } else {
-    setting.show_stored = false;
+    setting.stored[TRACE_STORED] = false;
     TRACE_DISABLE(TRACE_STORED_FLAG);
   }
 }
@@ -999,10 +1001,11 @@ void subtract_trace(int t, int f)
     for (int i=0;i<POINTS_COUNT;i++)
        measured[t][i] -= measured[f][i];                   // pre-load AVER
 
-  } else
+  } else {
     for (int i=0;i<POINTS_COUNT;i++)
       measured[t][i] += measured[f][i];                   // pre-load AVER
     setting.subtract[t] = 0;
+  }
 }
 
 void toggle_normalize(int t)
@@ -5415,6 +5418,7 @@ common_silent:
     set_attenuation(0.0);
   }
   TRACE_ENABLE(TRACE_STORED_FLAG);
+  setting.stored[TRACE_STORED] = true;
   set_reflevel(test_case[i].pass+10);
   set_sweep_frequency(ST_CENTER, (freq_t)(test_case[i].center * 1000000));
   set_sweep_frequency(ST_SPAN, (freq_t)(test_case[i].span * 1000000));
diff --git a/ui_sa.c b/ui_sa.c
index ac183c6..ef23dba 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -1607,7 +1607,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_traces_acb)
       else
         b->icon = setting.normalized[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
     } else if (data == 3) {
-      plot_printf(b->text, sizeof(b->text), "CALC\n%s", averageText[setting.average[0]]);
+      plot_printf(b->text, sizeof(b->text), "CALC\n%s", averageText[setting.average[current_trace]]);
       b->icon = setting.average[current_trace] ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
     }
     return;