diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index a333172..568d210 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -718,7 +718,7 @@ void TEF6686::readRDS(byte showrdserrors)
 
                   bool isValuePresent = false;
                   for (int i = 0; i < 50; i++) {                                                // Check if already in list
-                    if (rds.sortaf && (buffer0 == currentfreq) || buffer0 == 0 || af[i].frequency == buffer0) {
+                    if (rds.sortaf && ((buffer0 == currentfreq) || buffer0 == 0 || af[i].frequency == buffer0)) {
                       isValuePresent = true;
                       break;
                     }
@@ -732,7 +732,7 @@ void TEF6686::readRDS(byte showrdserrors)
 
                   isValuePresent = false;
                   for (int i = 0; i < 50; i++) {                                                // Check if already in list
-                    if (rds.sortaf && (buffer1 == currentfreq) || buffer1 == 0 || af[i].frequency == buffer1) {
+                    if (rds.sortaf && ((buffer1 == currentfreq) || buffer1 == 0 || af[i].frequency == buffer1)) {
                       isValuePresent = true;
                       break;
                     }
diff --git a/src/gui.cpp b/src/gui.cpp
index d58c32a..9d2cb86 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -7,7 +7,7 @@
 #include <cstring>
 
 byte menuitem;
-byte items[8] = {8, (dynamicspi ? 3 : 2), 6, 10, 9, 10, 10, 5};
+byte items[8] = {8, static_cast<byte>(dynamicspi ? 3 : 2), 6, 10, 9, 10, 10, 5};
 
 void doTheme() {  // Use this to put your own colors in: http://www.barth-dev.de/online/rgb565-color-picker/
   switch (CurrentTheme) {
@@ -348,6 +348,7 @@ void BuildAFScreen() {
       mappedfreqold3[i] = 0;
       eonpicodeold[i][0] = '\0';
       eonpsold[i] = "";
+      eonptyold[i] = 254;
     }
     for (byte i = 0; i < 20; i++) std::memset(eonpicodeold[i], '\0', sizeof(eonpicodeold[i]));
 
diff --git a/src/gui.h b/src/gui.h
index 2e79293..8d186e9 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -90,6 +90,7 @@ extern byte menupage;
 extern byte MSold;
 extern byte poweroptions;
 extern byte poweroptionsold;
+extern byte eonptyold[20];
 extern byte rdsblockold;
 extern byte region;
 extern byte screensaverOptions[5];