diff --git a/main.c b/main.c
index 750cf5f..704ae27 100644
--- a/main.c
+++ b/main.c
@@ -979,10 +979,10 @@ config_t config = {
   .low_level_output_offset =   100.0,    // Uncalibrated
   .high_level_output_offset =  0,    // Uncalibrated, but checking code is not yet present
   .harmonic_level_offset = 7,
-  .shift_level_offset = -0.5,
-  .drive1_level_offset = -1.5,
-  .drive2_level_offset = -3,
-  .drive3_level_offset = -3.5,
+  .shift_level_offset = 0.5,
+  .drive1_level_offset = 0,
+  .drive2_level_offset = -1.5,
+  .drive3_level_offset = -0.5,
   .correction_frequency =
   {
    { 10000, 100000, 1000000, 5000000, 15000000, 30000000, 145000000, 400000000, 720000000, 800000000, 800000001, 1519000000, 1527000000, 3000000000, 3500000000, 4000000000, 4500000000, 5000000000, 5500000000, 6000000000 }, // low in
diff --git a/sa_core.c b/sa_core.c
index 916ccf7..0a2e546 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -1825,17 +1825,14 @@ pureRSSI_t get_frequency_correction(freq_t f)      // Frequency dependent RSSI c
     //  ----------------- end duplication of code
     //
 
-    switch(actual_drive) {
-    case 1:
+    if (actual_drive >= 1)
       cv += float_TO_PURE_RSSI(config.drive1_level_offset);
-      break;
-    case 2:
+    if (actual_drive >= 2)
       cv += float_TO_PURE_RSSI(config.drive2_level_offset);
-      break;
-    case 3:
+    if (actual_drive >= 3)
       cv += float_TO_PURE_RSSI(config.drive3_level_offset);
-      break;
-    }
+
+
     if (ultra && f > ultra_threshold) {
       c = CORRECTION_LOW_ULTRA;
       if (LO_harmonic) {
@@ -3630,7 +3627,7 @@ again:                                                              // Spur redu
 #ifdef TINYSA4
               if (lf<2000000) {   // below 2MHz
                 local_IF += DEFAULT_SPUR_OFFSET-(actual_rbw_x10 > 1000 ? 200000 : 0);                  // Shift to avoid zero Hz peak
-                LO_spur_shifted = true;
+                LO_shifting = true;
               }
 #else
               local_IF = local_IF; // + DEFAULT_SPUR_OFFSET/2;                  // No spure removal and no spur, center in IF