diff --git a/src/TEF6686.cpp b/src/TEF6686.cpp
index 8e71844..9b48a0f 100644
--- a/src/TEF6686.cpp
+++ b/src/TEF6686.cpp
@@ -132,6 +132,7 @@ void TEF6686::init(byte TEF) {
     delay(50);
 
     xtalADC = analogRead(15);
+	Serial.println(xtalADC);
     if (xtalADC > XTAL_0V_ADC && xtalADC < XTAL_0V_ADC + XTAL_ADC_TOL) {
       Tuner_Init(tuner_init_tab9216);
       log_v("XTAL : 9.216M");
@@ -141,7 +142,7 @@ void TEF6686::init(byte TEF) {
     } else if (xtalADC > XTAL_2V_ADC - XTAL_ADC_TOL && xtalADC < XTAL_2V_ADC + XTAL_ADC_TOL) {
       Tuner_Init(tuner_init_tab55000);
       log_v("XTAL : 55M");
-    } else if (xtalADC > XTAL_2V_ADC + XTAL_ADC_TOL) {
+    } else {
       Tuner_Init(tuner_init_tab4000);
       log_v("XTAL : 4M");
     }
diff --git a/src/comms.cpp b/src/comms.cpp
index 6bba257..85497a7 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -616,4 +616,5 @@ void tryWiFi() {
     Server.end();
     Udp.stop();
     WiFi.mode(WIFI_OFF);
-  }
\ No newline at end of file
+  }
+}
\ No newline at end of file
diff --git a/src/rds.cpp b/src/rds.cpp
index b2f0aa5..0a31788 100644
--- a/src/rds.cpp
+++ b/src/rds.cpp
@@ -429,8 +429,10 @@ void readRds() {
 
           if (piState != RdsPiBuffer::STATE_INVALID) {
             DataPrint ("P");
-            DataPrint (String(((radio.rds.rdsA >> 8) >> 4) & 0xF, HEX) + String((radio.rds.rdsA >> 8) & 0xF, HEX));
-            DataPrint (String(((radio.rds.rdsA) >> 4) & 0xF, HEX) + String((radio.rds.rdsA) & 0xF, HEX));
+			String PIcodeToSend;
+			PIcodeToSend = String(((radio.rds.rdsA >> 8) >> 4) & 0xF, HEX) + String((radio.rds.rdsA >> 8) & 0xF, HEX) + String(((radio.rds.rdsA) >> 4) & 0xF, HEX) + String((radio.rds.rdsA) & 0xF, HEX);
+			PIcodeToSend.toUpperCase();
+            DataPrint (PIcodeToSend);
             while (piState != 0) {
               DataPrint("?");
               piState--;
@@ -438,6 +440,7 @@ void readRds() {
             DataPrint ("\n");
           }
         }
+		XDRGTKRDS.toUpperCase();
         DataPrint(XDRGTKRDS);
         XDRGTKRDSold = XDRGTKRDS;
       }