diff --git a/sonoff/sonoff.ino b/sonoff/sonoff.ino
index a1ab907ab..52cdb68ba 100755
--- a/sonoff/sonoff.ino
+++ b/sonoff/sonoff.ino
@@ -849,10 +849,8 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
     else if ((CMND_GPIO == command_code) && (index < MAX_GPIO_PIN)) {
       mytmplt cmodule;
       memcpy_P(&cmodule, &kModules[Settings.module], sizeof(cmodule));
-//      if ((GPIO_USER == cmodule.gp.io[index]) && (payload >= 0) && (payload < GPIO_SENSOR_END)) {
       if ((GPIO_USER == ValidGPIO(index, cmodule.gp.io[index])) && (payload >= 0) && (payload < GPIO_SENSOR_END)) {
         for (byte i = 0; i < MAX_GPIO_PIN; i++) {
-//          if ((GPIO_USER == cmodule.gp.io[i]) && (Settings.my_gp.io[i] == payload)) {
           if ((GPIO_USER == ValidGPIO(i, cmodule.gp.io[i])) && (Settings.my_gp.io[i] == payload)) {
             Settings.my_gp.io[i] = 0;
           }
@@ -862,7 +860,6 @@ void MqttDataHandler(char* topic, byte* data, unsigned int data_len)
       }
       snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("{"));
       for (byte i = 0; i < MAX_GPIO_PIN; i++) {
-//        if (GPIO_USER == cmodule.gp.io[i]) {
         if (GPIO_USER == ValidGPIO(i, cmodule.gp.io[i])) {
           if (jsflg) snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,"), mqtt_data);
           jsflg = 1;
diff --git a/sonoff/support.ino b/sonoff/support.ino
index 291f2069d..af93fa148 100644
--- a/sonoff/support.ino
+++ b/sonoff/support.ino
@@ -936,8 +936,20 @@ void GetFeatures()
 #ifdef USE_DISPLAY_SH1106
   feature_drv2 |= 0x00001000;  // xdsp_06_sh1106.ino
 #endif
+#ifdef USE_MP3_PLAYER
+  feature_drv2 |= 0x00002000;  // xdrv_14_mp3.ino
+#endif
 
 
+#ifdef NO_EXTRA_4K_HEAP
+  feature_drv2 |= 0x00800000;  // sonoff_post.h
+#endif
+#ifdef VTABLES_IN_IRAM
+  feature_drv2 |= 0x01000000;  // platformio.ini
+#endif
+#ifdef VTABLES_IN_DRAM
+  feature_drv2 |= 0x02000000;  // platformio.ini
+#endif
 #ifdef VTABLES_IN_FLASH
   feature_drv2 |= 0x04000000;  // platformio.ini
 #endif
diff --git a/sonoff/xdrv_02_webserver.ino b/sonoff/xdrv_02_webserver.ino
index 55eb0f41b..6cadb952f 100644
--- a/sonoff/xdrv_02_webserver.ino
+++ b/sonoff/xdrv_02_webserver.ino
@@ -1193,7 +1193,7 @@ void HandleSaveSettings()
       if (Settings.last_module != new_module) {
         Settings.my_gp.io[i] = 0;
       } else {
-        if (GPIO_USER == cmodule.gp.io[i]) {
+        if (GPIO_USER == ValidGPIO(i, cmodule.gp.io[i])) {
           snprintf_P(stemp, sizeof(stemp), PSTR("g%d"), i);
           WebGetArg(stemp, tmp, sizeof(tmp));
           Settings.my_gp.io[i] = (!strlen(tmp)) ? 0 : atoi(tmp);
diff --git a/tools/decode-status.py b/tools/decode-status.py
index b26be9df0..154b6e719 100644
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -108,10 +108,10 @@ a_features = [[
     "USE_CONFIG_OVERRIDE","BE_MINIMAL","USE_SENSORS","USE_CLASSIC",
     "USE_KNX_NO_EMULATION","USE_DISPLAY_MODES1TO5","USE_DISPLAY_GRAPH","USE_DISPLAY_LCD",
     "USE_DISPLAY_SSD1306","USE_DISPLAY_MATRIX","USE_DISPLAY_ILI9341","USE_DISPLAY_EPAPER",
-    "USE_DISPLAY_SH1106","","","",
+    "USE_DISPLAY_SH1106","USE_MP3_PLAYER","","",
     "","","","",
-    "","","","",
-    "","","VTABLES_IN_FLASH","PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH",
+    "","","","NO_EXTRA_4K_HEAP",
+    "VTABLES_IN_IRAM","VTABLES_IN_DRAM","VTABLES_IN_FLASH","PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH",
     "PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY","PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH","DEBUG_THEO","USE_DEBUG_DRIVER"
     ],[
     "","USE_ADC_VCC","USE_ENERGY_SENSOR","USE_PZEM004T",