diff --git a/plot.c b/plot.c
index 4dc30ae..db77f39 100644
--- a/plot.c
+++ b/plot.c
@@ -1953,7 +1953,7 @@ static void cell_grid_line_info(int x0, int y0)
   char buf[32];
   int xpos = GRID_X_TEXT - x0;
   int ypos = 0 - y0 + 2;
-  ili9341_set_foreground(DEFAULT_GRID_COLOR);
+  ili9341_set_foreground(/* DEFAULT_GRID_COLOR */ DEFAULT_MENU_COLOR );
   float   ref = get_trace_refpos(TRACE_ACTUAL);
   float scale = get_trace_scale(TRACE_ACTUAL);;
   for (int i = 0; i < NGRIDY; i++){
diff --git a/sa_core.c b/sa_core.c
index 1850e43..c5475f8 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -801,7 +801,7 @@ void calculate_step_delay(void)
     if (setting.frequency_step == 0) {            // zero span mode, not dependent on selected RBW
       SI4432_step_delay = 0;
     } else {
-#if 1
+#if 0       // Table for 200us delay inside SI4432_set_freq
       if (actual_rbw_x10 >= 1910)      { SI4432_step_delay =  150; SI4432_offset_delay = 10; }
       else if (actual_rbw_x10 >= 1420) { SI4432_step_delay =  350; SI4432_offset_delay = 10; }
       else if (actual_rbw_x10 >= 750)  { SI4432_step_delay =  450; SI4432_offset_delay = 10; }
@@ -1673,8 +1673,8 @@ static bool sweep(bool break_on_operation)
 
   modulation_counter = 0;                                             // init modulation counter in case needed
 
-//  if (sweep_counter > 5000 && setting.average == AV_OFF)            // refresh HW after 5000 sweeps
-//    dirty = true;
+  if (sweep_counter > 5000 && setting.average == AV_OFF && setting.frequency_step > 0)      // refresh HW after 5000 sweeps
+    dirty = true;
 
   if (dirty)                    // Calculate new scanning solution
     sweep_counter = 0;