diff --git a/main.c b/main.c
index ebce037..cd67b6c 100644
--- a/main.c
+++ b/main.c
@@ -407,7 +407,6 @@ VNA_SHELL_FUNCTION(cmd_reset)
   }
 #endif
   shell_printf("Performing reset\r\n");
-
   rccEnableWWDG(FALSE);
   WWDG->CFR = 0x60;
   WWDG->CR = 0xff;
diff --git a/nanovna.h b/nanovna.h
index f895851..d113ae0 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-//#ifdef TINYSA_F303
+#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-//#endif
+#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303
diff --git a/sa_core.c b/sa_core.c
index 686d4ac..5a068ee 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -740,7 +740,7 @@ void set_refer_output(int v)
 {
   setting.refer = v;
   set_calibration_freq(setting.refer);
-//  dirty = true;
+  dirty = true;
 }
 
 void set_decay(int d)
@@ -1966,7 +1966,7 @@ static const struct {
   {  3000,       150,           50,      200,   -95,    1.3},
   {  1000,       300,          100,      100,   -105,   0.3},
   {   300,       400,          120,      100,   -110,   0.7},
-  {   100,       700,          120,      100,   -115,   0.5},
+  {   100,       900,          120,      100,   -115,   0.5},
   {    30,      1600,          300,      100,   -120,   0.7},
   {    10,      4000,          600,      100,   -122,   1.1},
   {     3,     18700,        12000,      100,   -125,   1.0}
@@ -2577,8 +2577,8 @@ void update_rbw(void)           // calculate the actual_rbw and the vbwSteps (#
 
     if (setting.step_delay_mode==SD_FAST) {    // if in fast scanning
       temp_actual_rbw_x10 = frequency_step_x10;
-    } else if (setting.step_delay_mode==SD_PRECISE) {
-      temp_actual_rbw_x10 = 4*frequency_step_x10;
+//    } else if (setting.step_delay_mode==SD_PRECISE) {
+//      temp_actual_rbw_x10 = 4*frequency_step_x10;
     } else {
       temp_actual_rbw_x10 = 2*frequency_step_x10;
     }
@@ -7102,13 +7102,11 @@ again:
     for (int j= 0; j < CALIBRATE_RBWS; j++ ) {
 #if 1
       reset_settings(M_LOW);
-
+      set_refer_output(0);
+#ifdef TINYSA4
       config.ultra = true;          // Enable ultra
       maxFreq = 12000000000;
       ultra = true;
-
-      set_refer_output(0);
-#ifdef TINYSA4
       set_attenuation(0);
 #else
       set_attenuation(10);
@@ -7139,14 +7137,14 @@ again:
         set_extra_lna(true);
         break;
       case CS_ULTRA990:
-        set_sweep_frequency(ST_CENTER, 900000000);
+        set_sweep_frequency(ST_CENTER, 150000000);
         test_output = true;
-        test_path = 3;      // Ultra path at 990MHz
+        test_path = 0;      // Normal path at 900MHz
         break;
       case CS_DIRECT:
-        set_sweep_frequency(ST_CENTER, 900000000);
+        set_sweep_frequency(ST_CENTER, 150000000);
         test_output = true;
-        test_path = 5;      // Direct path at 990MHz
+        test_path = 4;      // Direct path at 900MHz
         break;
 #endif
       }
diff --git a/si4468.c b/si4468.c
index 0771ffb..5e49d53 100644
--- a/si4468.c
+++ b/si4468.c
@@ -1957,7 +1957,7 @@ freq_t SI4463_set_freq(freq_t freq)
   if (SI4463_in_tx_mode)
     SI4463_start_tx(0);
   else {
-    SI4463_short_start_rx();
+    SI4463_start_rx(0);
   }
 //  SI4463_set_gpio(3,SI446X_GPIO_MODE_DRIVE0);        // For measuring duration of set_freq
   SI4463_frequency_changed = true;
diff --git a/ui_sa.c b/ui_sa.c
index 122ce77..1bf1cda 100644
--- a/ui_sa.c
+++ b/ui_sa.c
@@ -1365,7 +1365,7 @@ static UI_FUNCTION_CALLBACK(menu_clearconfig_cb)
   if (uistat.value != 1234)
     return;
   clear_all_config_prop_data();
-#ifdef TINYSA4
+#ifndef TINYSA4
 #define SCB_AIRCR_VECTKEYSTAT_LSB 16
 #define SCB_AIRCR_VECTKEYSTAT       (0xFFFF << SCB_AIRCR_VECTKEYSTAT_LSB)
 #define SCB_AIRCR_VECTKEY       (0x05FA << SCB_AIRCR_VECTKEYSTAT_LSB)
@@ -1373,9 +1373,13 @@ static UI_FUNCTION_CALLBACK(menu_clearconfig_cb)
   SCB->AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_SYSRESETREQ;
           while(true);
 #else
-  reset_settings(M_LOW);
-  ui_mode_normal();
+  rccEnableWWDG(FALSE);
+  WWDG->CFR = 0x60;
+  WWDG->CR = 0xff;
+  /* wait forever */
 #endif
+  while (1)
+    ;
 }
 
 float nf_gain;