diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 488802316b..c301e220ef 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -3936,13 +3936,13 @@
     #define MICS2710_SUPPORT    1
     #define MICS5525_SUPPORT    1
 
-// MAX6675  14 11 10
-#ifndef MAX6675_SUPPORT
-#define MAX6675_SUPPORT 1
-#endif
-#define MAX6675_CS_PIN 	14
-#define MAX6675_SO_PIN	11
-#define MAX6675_SCK_PIN	10
+    // MAX6675  14 11 10
+    #define MAX6675_SUPPORT 1
+    #define MAX6675_CS_PIN 	14
+    #define MAX6675_SO_PIN	11
+    #define MAX6675_SCK_PIN	10
+
+    #define INFLUXDB_SUPPORT    1
 
 #elif defined(TRAVIS02)
 
@@ -4054,10 +4054,16 @@
     #define PULSEMETER_SUPPORT  1
 
     // Test non-default modules
+    #define MDNS_CLIENT_SUPPORT 1
+    #define NOFUSS_SUPPORT      1
+    #define UART_MQTT_SUPPORT   1
+    #define INFLUXDB_SUPPORT    1
+    #define IR_SUPPORT          1
+    #define RF_SUPPORT          1
+    #define OTA_MQTT_SUPPORT    1
     #define LLMNR_SUPPORT       1
     #define NETBIOS_SUPPORT     1
     #define SSDP_SUPPORT        1
-    #define RF_SUPPORT          1
 
 #else
 
diff --git a/code/espurna/influxdb.ino b/code/espurna/influxdb.ino
index 0701858c88..9e44a2226c 100644
--- a/code/espurna/influxdb.ino
+++ b/code/espurna/influxdb.ino
@@ -8,12 +8,11 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>
 
 #if INFLUXDB_SUPPORT
 
-#include "ESPAsyncTCP.h"
-
-#include "libs/SyncClientWrap.h"
+#include <ESPAsyncTCP.h>
+#include <SyncClient.h>
 
 bool _idb_enabled = false;
-SyncClientWrap * _idb_client;
+std::unique_ptr<SyncClient> _idb_client = nullptr;
 
 // -----------------------------------------------------------------------------
 
@@ -116,7 +115,7 @@ bool idbEnabled() {
 
 void idbSetup() {
 
-    _idb_client = new SyncClientWrap();
+    _idb_client = std::make_unique<SyncClient>();
 
     _idbConfigure();
 
diff --git a/code/espurna/libs/SyncClientWrap.h b/code/espurna/libs/SyncClientWrap.h
deleted file mode 100644
index b252eaf5be..0000000000
--- a/code/espurna/libs/SyncClientWrap.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-
-SyncClientWrap
-
-Temporary wrap to fix https://github.com/me-no-dev/ESPAsyncTCP/issues/109
-*/
-
-#pragma once
-
-#include <SyncClient.h>
-
-// ref Core 2.5.0: cores/esp8266/IPAddress.h
-#ifndef CONST
-#include <lwip/init.h>
-
-#if LWIP_VERSION_MAJOR == 1
-#define CONST
-#else
-#define CONST const
-#endif
-
-#endif
-
-class SyncClientWrap: public SyncClient {
-
-    public:
-        SyncClientWrap() {}
-        ~SyncClientWrap() {}
-
-        // int connect(const char*, uint16_t);
-        using SyncClient::connect;
-
-        int connect(CONST IPAddress& ip, uint16_t port) { IPAddress _ip(ip); return SyncClient::connect(_ip, port); }
-        bool flush(unsigned int maxWaitMs = 0) { SyncClient::flush(); return true; }
-        bool stop(unsigned int maxWaitMs = 0) { SyncClient::stop(); return true; }
-
-};
diff --git a/code/platformio.ini b/code/platformio.ini
index 7975140ff5..7c9a69ecb3 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -106,7 +106,7 @@ lib_deps =
     https://github.com/xoseperez/eeprom_rotate#0.9.2
     Embedis
     https://github.com/plerup/espsoftwareserial#3.4.1
-    https://github.com/me-no-dev/ESPAsyncTCP#7e9ed22
+    https://github.com/me-no-dev/ESPAsyncTCP#75c2513c
     https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
     https://bitbucket.org/xoseperez/fauxmoesp.git#3.1.0
     https://github.com/xoseperez/hlw8012.git#1.1.0