diff --git a/plot.c b/plot.c
index df19c5b..49a4840 100644
--- a/plot.c
+++ b/plot.c
@@ -902,7 +902,7 @@ trace_get_value_string_delta(int t, char *buf, int len, float array[POINTS_COUNT
 }
 #endif
 
-inline void trace_get_value_string(     // Only used at one place
+void trace_get_value_string(     // Only used at one place
     int t, char *buf, int len,
     int i, float coeff[POINTS_COUNT],
     int ri, int mtype,
diff --git a/sa_core.c b/sa_core.c
index 3665d1f..0ec89f6 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -22,7 +22,7 @@
 #include "stdlib.h"
 
 #pragma GCC push_options
-#pragma GCC optimize ("Os")
+#pragma GCC optimize ("Os")             // "Os" causes problem in selftest!!!!!!!!
 
 
 //#define __DEBUG_AGC__         If set the AGC value will be shown in the stored trace and FAST_SWEEP rmmode will be disabled
@@ -47,21 +47,6 @@ const int reffer_freq[] = {30000000, 15000000, 10000000, 4000000, 3000000, 20000
 
 int in_selftest = false;
 
-#if 0
-const char *dummy = "this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available\
-this is a very long string only used to fill memory so I know when the memory is full and I can remove some of this string to make more memory available"
-;
-#endif
-
 void update_min_max_freq(void)
 {
   switch(setting.mode) {
@@ -1065,6 +1050,8 @@ void calculate_correction(void)
     scaled_correction_multi[i] = (int32_t) ( m / d );
   }
 }
+#pragma GCC push_options
+#pragma GCC optimize ("Og")             // "Os" causes problem
 
 pureRSSI_t get_frequency_correction(uint32_t f)      // Frequency dependent RSSI correction to compensate for imperfect LPF
 {
@@ -1088,6 +1075,8 @@ pureRSSI_t get_frequency_correction(uint32_t f)      // Frequency dependent RSSI
 #endif
   return(cv);
 }
+#pragma GCC pop_options
+
 
 
 float peakLevel;
@@ -1593,7 +1582,6 @@ static void calculate_static_correction(void)                   // Calculate the
           - setting.offset);
 }
 
-
 pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)     // Measure the RSSI for one frequency, used from sweep and other measurement routines. Must do all HW setup
 {
   int modulation_delay = 0;
@@ -3525,8 +3513,8 @@ quit:
   reset_settings(M_LOW);
 #endif
 }
-#pragma GCC pop_options
 
+#pragma GCC pop_options
 
 #if 0                           // fixed point FFT