diff --git a/src/AmsConfiguration.cpp b/src/AmsConfiguration.cpp
index 919dd102..62819081 100644
--- a/src/AmsConfiguration.cpp
+++ b/src/AmsConfiguration.cpp
@@ -451,6 +451,9 @@ bool AmsConfiguration::getEntsoeConfig(EntsoeConfig& config) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_ENTSOE_START, config);
 		EEPROM.end();
+		if(strlen(config.token) != 0 && strlen(config.token) != 36) {
+			clearEntsoe(config);
+		}
 		return true;
 	} else {
 		return false;
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index d758f62c..e8ecef45 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -18,7 +18,7 @@ ADC_MODE(ADC_VCC);
 #if defined(ESP32)
 #include <esp_task_wdt.h>
 #endif
-#define WDT_TIMEOUT 10
+#define WDT_TIMEOUT 30
 
 #include "AmsToMqttBridge.h"
 #include "AmsStorage.h"
@@ -139,12 +139,14 @@ void setup() {
 	hw.ledBlink(LED_GREEN, 1);
 	hw.ledBlink(LED_BLUE, 1);
 
+	#if defined(ESP32)
 	EntsoeConfig entsoe;
 	if(config.getEntsoeConfig(entsoe) && strlen(entsoe.token) > 0) {
 		eapi = new EntsoeApi(&Debug);
 		eapi->setup(entsoe);
 		ws.setEntsoeApi(eapi);
 	}
+	#endif
 
 	bool shared = false;
 	config.getMeterConfig(meterConfig);
@@ -439,6 +441,7 @@ void loop() {
 				mqtt->disconnect();
 			}
 
+			#if defined(ESP32)
 			if(eapi != NULL && ntpEnabled) {
 				if(eapi->loop() && mqtt != NULL && mqttHandler != NULL && mqtt->connected()) {
 					mqttHandler->publishPrices(eapi);
@@ -456,10 +459,11 @@ void loop() {
 				} else if(eapi != NULL) {
 					delete eapi;
 					eapi = NULL;
-					ws.setEntsoeApi(eapi);
+					ws.setEntsoeApi(NULL);
 				}
 				config.ackEntsoeChange();
 			}
+			#endif
 			ws.loop();
 		}
 		if(mqtt != NULL) { // Run loop regardless, to let MQTT do its work.
diff --git a/src/IEC6205675.cpp b/src/IEC6205675.cpp
index 3f7d5935..4cdee6ac 100644
--- a/src/IEC6205675.cpp
+++ b/src/IEC6205675.cpp
@@ -471,9 +471,8 @@ double IEC6205675::getNumber(CosemData* item) {
                 break;
             }
             case CosemTypeLongSigned: {
-                uint16_t u16 = ntohs(item->lu.data); // ntohs only works for uint16 ?
-                int16_t i16 = u16; // Cast to int16 before use?
-                ret = i16; // Who knows, got to try it all...
+                int16_t i16 = ntohs(item->ls.data);
+                ret = i16;
                 pos += 3;
                 break;
             }
diff --git a/src/entsoe/DnbCurrParser.cpp b/src/entsoe/DnbCurrParser.cpp
index 00b6dc53..82fcf278 100644
--- a/src/entsoe/DnbCurrParser.cpp
+++ b/src/entsoe/DnbCurrParser.cpp
@@ -30,6 +30,7 @@ size_t DnbCurrParser::write(const uint8_t *buffer, size_t size) {
 }
 
 size_t DnbCurrParser::write(uint8_t byte) {
+    if(pos >= 64) pos = 0;
     if(pos == 0) {
         if(byte == '<') {
             buf[pos++] = byte;
diff --git a/src/entsoe/EntsoeA44Parser.cpp b/src/entsoe/EntsoeA44Parser.cpp
index c01504df..1d7fa9b2 100644
--- a/src/entsoe/EntsoeA44Parser.cpp
+++ b/src/entsoe/EntsoeA44Parser.cpp
@@ -14,6 +14,7 @@ char* EntsoeA44Parser::getMeasurementUnit() {
 }
 
 float EntsoeA44Parser::getPoint(uint8_t position) {
+    if(position >= 24) return ENTSOE_NO_VALUE;
     return points[position];
 }
 
@@ -41,6 +42,7 @@ size_t EntsoeA44Parser::write(const uint8_t *buffer, size_t size) {
 }
 
 size_t EntsoeA44Parser::write(uint8_t byte) {
+    if(pos >= 64) pos = 0;
     if(docPos == DOCPOS_CURRENCY) {
         buf[pos++] = byte;
         if(pos == 3) {
diff --git a/src/entsoe/EntsoeApi.cpp b/src/entsoe/EntsoeApi.cpp
index 594446e4..d826a497 100644
--- a/src/entsoe/EntsoeApi.cpp
+++ b/src/entsoe/EntsoeApi.cpp
@@ -13,6 +13,7 @@ EntsoeApi::EntsoeApi(RemoteDebug* Debug) {
 
     client.setInsecure();
     https.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+    https.setTimeout(5000);
 
     // Entso-E uses CET/CEST
     TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};
@@ -63,8 +64,10 @@ float EntsoeApi::getValueForHour(time_t cur, int8_t hour) {
         } else {
             return ENTSOE_NO_VALUE;
         }
-        multiplier *= getCurrencyMultiplier(tomorrow->getCurrency(), config->currency);
-    } else if(pos > 0) {
+        float mult = getCurrencyMultiplier(tomorrow->getCurrency(), config->currency);
+        if(mult == 0) return ENTSOE_NO_VALUE;
+        multiplier *= mult;
+    } else if(pos >= 0) {
         if(today == NULL)
             return ENTSOE_NO_VALUE;
         value = today->getPoint(pos);
@@ -73,7 +76,9 @@ float EntsoeApi::getValueForHour(time_t cur, int8_t hour) {
         } else {
             return ENTSOE_NO_VALUE;
         }
-        multiplier *= getCurrencyMultiplier(today->getCurrency(), config->currency);
+        float mult = getCurrencyMultiplier(today->getCurrency(), config->currency);
+        if(mult == 0) return ENTSOE_NO_VALUE;
+        multiplier *= mult;
     }
     return value * multiplier;
 }
@@ -288,8 +293,12 @@ float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to) {
                 if(retrieve(url, &p)) {
                     if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi)  got exchange rate %.4f\n", p.getValue());
                     currencyMultiplier /= p.getValue();
+                } else {
+                    return 0;
                 }
             }
+        } else {
+            return 0;
         }
         if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("(EntsoeApi) Resulting currency multiplier: %.4f\n", currencyMultiplier);
         lastCurrencyFetch = midnightMillis;
diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index 638abb34..3ef8f508 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -791,7 +791,6 @@ void AmsWebServer::dataJson() {
 		mqttStatus,
 		mqtt == NULL ? 0 : (int) mqtt->lastError(),
 		price == ENTSOE_NO_VALUE ? "null" : String(price, 2).c_str(),
-		time(nullptr),
 		meterState->getMeterType(),
 		meterConfig->distributionSystem,
 		ea->getMonthMax(),
@@ -801,7 +800,8 @@ void AmsWebServer::dataJson() {
 		ea->getUseToday(),
 		ea->getCostToday(),
 		ea->getUseThisMonth(),
-		ea->getCostThisMonth()
+		ea->getCostThisMonth(),
+		(uint32_t) time(nullptr)
 	);
 
 	server.sendHeader("Cache-Control", "no-cache, no-store, must-revalidate");
@@ -1048,7 +1048,6 @@ void AmsWebServer::handleSetup() {
 				break;
 			case 200: // ESP32
 				gpioConfig->hanPin = 16;
-				gpioConfig->apPin = 4;
 				gpioConfig->ledPin = 2;
 				gpioConfig->ledInverted = false;
 				break;
@@ -1287,7 +1286,6 @@ void AmsWebServer::handleSave() {
 		strcpy(entsoe.currency, server.arg("ecu").c_str());
 		entsoe.multiplier = server.arg("em").toFloat() * 1000;
 		config->setEntsoeConfig(entsoe);
-		eapi->setup(entsoe);
 	}
 
 	printI("Saving configuration now...");
diff --git a/web/data.json b/web/data.json
index 5dd1d3a1..c2cc4a2d 100644
--- a/web/data.json
+++ b/web/data.json
@@ -31,7 +31,6 @@
     "mm" : %d,
     "me" : %d,
     "p" : %s,
-    "c" : %lu,
     "mt" : %d,
     "ds" : %d,
     "ea" : {
@@ -49,5 +48,6 @@
             "u" : %.2f,
             "c" : %.2f
         }
-    }
+    },
+    "c" : %lu
 }
\ No newline at end of file