diff --git a/HAA/HAA_Installer/main/header.h b/HAA/HAA_Installer/main/header.h
index ba3aee85..f3206135 100644
--- a/HAA/HAA_Installer/main/header.h
+++ b/HAA/HAA_Installer/main/header.h
@@ -10,6 +10,6 @@
 
 #include "../../common/common_headers.h"
 
-#define INSTALLER_VERSION           "7.5.1"
+#define INSTALLER_VERSION           "7.5.2"
 
 #endif  // __HAA_OTA_HEADER_H__
diff --git a/HAA/HAA_Installer/main/setup.html b/HAA/HAA_Installer/main/setup.html
index b46fac58..6c90aca1 100644
--- a/HAA/HAA_Installer/main/setup.html
+++ b/HAA/HAA_Installer/main/setup.html
@@ -46,8 +46,8 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <option value="2">DIO</option>
 <option value="3">DOUT</option>
 </select></label></div>
-<input type="submit" id="join" value="Save"/><br><br>
-<input type="button" id="refresh" value="⟲ Search WiFi" onClick="window.location.reload(true)"/>
+<input type="submit" id="join" value="Save"><br><br>
+<input type="button" id="refresh" value="⟲ Search WiFi" onClick="window.location.reload(true)">
 Current: <!-- part HTML_SETTINGS_CURRENT_WIFI --><br>
 <div class="nonetworks" style="display:none;">
 None found
@@ -60,21 +60,21 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 </ul>
 <div class="field required ssid" style="display:none;">
 <label for="ssid">SSID</label>
-<input type="text" id="ssid" name="sid" maxlength="63"/>
+<input type="text" id="ssid" name="sid" maxlength="63">
 </div>
 <div class="field required pass" style="display:none;">
 <label for="pass">Password</label>
-<input type="password" id="pass" name="psw" maxlength="63"/>
+<input type="password" id="pass" name="psw" maxlength="63">
 </div>
 <div class="field bssid" style="display:none;">
 <label for="bssid">BSSID</label>
-<input type="text" id="bssid" name="bid" maxlength="12"/>
+<input type="text" id="bssid" name="bid" maxlength="12">
 </div>
 <div class="field">
 <label>Update Server</label>
-<input type="text" name="ser" value="<!-- part HTML_SETTINGS_REPOSERVER -->" />
+<input type="text" name="ser" value="<!-- part HTML_SETTINGS_REPOSERVER -->">
 <label>Port</label>
-<input type="text" name="prt" maxlength="5" value="<!-- part HTML_SETTINGS_REPOPORT -->" />
+<input type="text" name="prt" maxlength="5" value="<!-- part HTML_SETTINGS_REPOPORT -->">
 <input type="checkbox" name="ssl" value="y" <!-- part HTML_SETTINGS_REPOSSL -->> HTTPS<br>
 </div>
 </form>
@@ -114,7 +114,6 @@ <h2>If you have paid for this firmware or for a device with it installed, you ha
 hide(pass_block);
 disable(pass_field);
 pass_field.value="";
-show(bssid_block);
 enable(join_button);
 }
 }
diff --git a/HAA/HAA_Main/main/header.h b/HAA/HAA_Main/main/header.h
index 52525431..1db76f83 100644
--- a/HAA/HAA_Main/main/header.h
+++ b/HAA/HAA_Main/main/header.h
@@ -11,7 +11,7 @@
 #include "../../common/common_headers.h"
 
 // Version
-#define HAA_FIRMWARE_VERSION                "12.7.1"
+#define HAA_FIRMWARE_VERSION                "12.7.2"
 #define HAA_FIRMWARE_BETA_REVISION          ""
 #define HAA_FIRMWARE_CODENAME               "Merlin"
 
diff --git a/HAA/HAA_Main/main/main.c b/HAA/HAA_Main/main/main.c
index 29d2ea98..9e9868ce 100644
--- a/HAA/HAA_Main/main/main.c
+++ b/HAA/HAA_Main/main/main.c
@@ -903,7 +903,7 @@ void wifi_ping_gw_task() {
 void wifi_reconnection_task() {
     rs_esp_timer_stop_forced(WIFI_WATCHDOG_TIMER);
     
-    homekit_mdns_announce_pause();
+    homekit_mdns_announce_stop();
     
     if (main_config.wifi_status == WIFI_STATUS_CONNECTED) {
         sdk_wifi_station_disconnect();
@@ -917,8 +917,6 @@ void wifi_reconnection_task() {
     
     led_blink(6);
     
-    do_actions(ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE), 4);
-    
     vTaskDelay(MS_TO_TICKS(500));
     
     for (;;) {
@@ -962,7 +960,7 @@ void wifi_reconnection_task() {
             
             save_last_working_phy();
             
-            homekit_mdns_announce();
+            homekit_mdns_announce_start();
             
             do_actions(ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE), 3);
             
@@ -999,6 +997,8 @@ void set_main_wifi_status_connecting() {
 void wifi_watchdog() {
     //INFO("Wifi status %i, sleep mode %i", main_config.wifi_status, sdk_wifi_get_sleep_type());
     const int current_ip = wifi_config_get_ip();
+    int wifi_error = false;
+    
     if (main_config.wifi_status == WIFI_STATUS_CONNECTED && current_ip >= 0 && main_config.wifi_error_count <= main_config.wifi_ping_max_errors) {
 #ifdef ESP_PLATFORM
         uint8_t channel_primary = main_config.wifi_channel;
@@ -1027,20 +1027,15 @@ void wifi_watchdog() {
         }
         
         if (main_config.wifi_channel != current_channel) {
-            main_config.wifi_channel = current_channel;
-            INFO("Wifi new Ch %i", current_channel);
-            homekit_mdns_announce();
+            wifi_error = true;
+            main_config.wifi_status = WIFI_STATUS_CONNECTING;
             do_actions(ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE), 6);
-            
-            main_config.wifi_arp_count = 0;
         }
         
         if (main_config.wifi_ip != current_ip) {
-            main_config.wifi_ip = current_ip;
-            homekit_mdns_announce();
+            wifi_error = true;
+            main_config.wifi_status = WIFI_STATUS_CONNECTING;
             do_actions(ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE), 7);
-            
-            main_config.wifi_arp_count = 0;
         }
         
         if (main_config.wifi_arp_count_max > 0) {
@@ -1059,13 +1054,19 @@ void wifi_watchdog() {
         }
         
     } else {
-        ERROR("Wifi");
+        wifi_error = true;
         
         if ((main_config.wifi_status == WIFI_STATUS_CONNECTED && main_config.wifi_mode >= 2) ||
             main_config.wifi_error_count > main_config.wifi_ping_max_errors) {
             main_config.wifi_status = WIFI_STATUS_DISCONNECTED;
         }
         
+        do_actions(ch_group_find_by_serv(SERV_TYPE_ROOT_DEVICE), 4);
+    }
+    
+    if (wifi_error) {
+        ERROR("Wifi");
+        
         main_config.wifi_error_count = 0;
         
         if (xTaskCreate(wifi_reconnection_task, "RCN", WIFI_RECONNECTION_TASK_SIZE, NULL, WIFI_RECONNECTION_TASK_PRIORITY, NULL) != pdPASS) {
@@ -1534,6 +1535,7 @@ float byte_array_to_num(uint8_t* data, const uint8_t array_size, const uint8_t t
 // --- POWER MONITOR
 void power_monitor_task(void* args) {
     ch_group_t* ch_group = args;
+    ch_group->is_working = true;
     
     float voltage = 0;
     float current = 0;
@@ -1697,9 +1699,7 @@ void power_monitor_timer_worker(TimerHandle_t xTimer) {
         ch_group_t* ch_group = (ch_group_t*) pvTimerGetTimerID(xTimer);
         if (ch_group->main_enabled) {
             if (!ch_group->is_working) {
-                if (xTaskCreate(power_monitor_task, "PM", POWER_MONITOR_TASK_SIZE, (void*) ch_group, POWER_MONITOR_TASK_PRIORITY, NULL) == pdPASS) {
-                    ch_group->is_working = true;
-                } else {
+                if (xTaskCreate(power_monitor_task, "PM", POWER_MONITOR_TASK_SIZE, (void*) ch_group, POWER_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                     homekit_remove_oldest_client();
                     ERROR("New PM");
                 }
@@ -2729,6 +2729,7 @@ void temperature_task(void* args) {
     }
     
     ch_group_t* ch_group = args;
+    ch_group->is_working = true;
     
     float temperature_value = 0.0;
     float humidity_value = 0.0;
@@ -2943,9 +2944,7 @@ void temperature_timer_worker(TimerHandle_t xTimer) {
     if (!homekit_is_pairing()) {
         ch_group_t* ch_group = (ch_group_t*) pvTimerGetTimerID(xTimer);
         if (!ch_group->is_working) {
-            if (xTaskCreate(temperature_task, "TEM", TEMPERATURE_TASK_SIZE, (void*) ch_group, TEMPERATURE_TASK_PRIORITY, NULL) == pdPASS) {
-                ch_group->is_working = true;
-            } else {
+            if (xTaskCreate(temperature_task, "TEM", TEMPERATURE_TASK_SIZE, (void*) ch_group, TEMPERATURE_TASK_PRIORITY, NULL) != pdPASS) {
                 homekit_remove_oldest_client();
                 ERROR("New TEM");
             }
@@ -3476,22 +3475,24 @@ void rgbw_set_timer_worker() {
     while (lightbulb_group) {
         if (LIGHTBULB_TYPE != LIGHTBULB_TYPE_VIRTUAL) {
             lightbulb_group->has_changed = false;
+            
             for (int i = 0; i < LIGHTBULB_CHANNELS; i++) {
+                int pwm_needs_update = false;
+                
                 if (private_abs(lightbulb_group->target[i] - lightbulb_group->current[i]) > private_abs(LIGHTBULB_STEP_VALUE[i])) {
                     all_channels_ready = false;
                     lightbulb_group->current[i] += LIGHTBULB_STEP_VALUE[i];
                     lightbulb_group->has_changed = true;
+                    pwm_needs_update = true;
                     
-                    if (LIGHTBULB_TYPE == LIGHTBULB_TYPE_PWM) {
-                        haa_pwm_set_duty(lightbulb_group->gpio[i], lightbulb_group->current[i]);
-                    }
                 } else if (lightbulb_group->current[i] != lightbulb_group->target[i]) {
                     lightbulb_group->current[i] = lightbulb_group->target[i];
                     lightbulb_group->has_changed = true;
-                    
-                    if (LIGHTBULB_TYPE == LIGHTBULB_TYPE_PWM) {
-                        haa_pwm_set_duty(lightbulb_group->gpio[i], lightbulb_group->current[i]);
-                    }
+                    pwm_needs_update = true;
+                }
+                
+                if (pwm_needs_update && LIGHTBULB_TYPE <= LIGHTBULB_TYPE_PWM_CWWW) {
+                    haa_pwm_set_duty(lightbulb_group->gpio[i], lightbulb_group->current[i]);
                 }
             }
             
@@ -4429,6 +4430,7 @@ void hkc_fan_status_setter(homekit_characteristic_t* ch0, const homekit_value_t
 // --- LIGHT SENSOR
 void light_sensor_task(void* args) {
     ch_group_t* ch_group = (ch_group_t*) args;
+    ch_group->is_working = true;
     
     float luxes = 0.0001f;
     
@@ -4488,9 +4490,7 @@ void light_sensor_timer_worker(TimerHandle_t xTimer) {
     if (!homekit_is_pairing()) {
         ch_group_t* ch_group = (ch_group_t*) pvTimerGetTimerID(xTimer);
         if (!ch_group->is_working) {
-            if (xTaskCreate(light_sensor_task, "LUX", LIGHT_SENSOR_TASK_SIZE, (void*) ch_group, LIGHT_SENSOR_TASK_PRIORITY, NULL) == pdPASS) {
-                ch_group->is_working = true;
-            } else {
+            if (xTaskCreate(light_sensor_task, "LUX", LIGHT_SENSOR_TASK_SIZE, (void*) ch_group, LIGHT_SENSOR_TASK_PRIORITY, NULL) != pdPASS) {
                 homekit_remove_oldest_client();
                 ERROR("New LUX");
             }
@@ -4971,6 +4971,7 @@ void free_monitor_task(void* args) {
     
     if (args) {
         ch_group = args;
+        ch_group->is_working = true;
     } else {
         uart_receiver_data_t* uart_receiver_data = main_config.uart_receiver_data;
         while (uart_receiver_data) {
@@ -5432,6 +5433,8 @@ void free_monitor_task(void* args) {
                     if (adv_i2c_slave_read(FM_I2C_BUS, (uint8_t) FM_I2C_ADDR, (uint8_t*) &FM_I2C_REG[FM_I2C_REG_FIRST], FM_I2C_REG_LEN, i2c_value, i2c_value_len) == 0) {
                         value = byte_array_to_num(&i2c_value[FM_I2C_VAL_OFFSET], FM_VAL_LEN, FM_VAL_TYPE);
                         get_value = true;
+                    } else {
+                        ERROR("<%i> I2C", ch_group->serv_index);
                     }
                 }
             } else if (fm_sensor_type >= FM_SENSOR_TYPE_UART) {
@@ -5529,9 +5532,7 @@ void free_monitor_timer_worker(TimerHandle_t xTimer) {
         ch_group_t* ch_group = (ch_group_t*) pvTimerGetTimerID(xTimer);
         if (ch_group->main_enabled) {
             if (!ch_group->is_working) {
-                if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) == pdPASS) {
-                    ch_group->is_working = true;
-                } else {
+                if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                     ERROR("New FM");
                     homekit_remove_oldest_client();
                 }
@@ -5623,7 +5624,7 @@ void recv_uart_timer_worker(TimerHandle_t xTimer) {
     }
     
     if (uart_has_data & !main_config.uart_recv_is_working) {
-        if (xTaskCreate(recv_uart_task, "RUA", RECV_UART_TASK_SIZE, NULL, RECV_UART_TASK_PRIORITY, NULL) == pdTRUE) {
+        if (xTaskCreate(recv_uart_task, "RUA", RECV_UART_TASK_SIZE, NULL, RECV_UART_TASK_PRIORITY, NULL) == pdPASS) {
             main_config.uart_recv_is_working = true;
         }
     }
@@ -6973,9 +6974,7 @@ void do_actions(ch_group_t* ch_group, uint8_t action) {
                             if (ch_group->main_enabled) {
                                 if (!ch_group->is_working) {
                                     FM_OVERRIDE_VALUE = action_serv_manager->value;
-                                    if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) == pdPASS) {
-                                        ch_group->is_working = true;
-                                    } else {
+                                    if (xTaskCreate(free_monitor_task, "FM", FREE_MONITOR_TASK_SIZE, (void*) ch_group, FREE_MONITOR_TASK_PRIORITY, NULL) != pdPASS) {
                                         homekit_remove_oldest_client();
                                         ERROR("New FM");
                                     }
@@ -8836,8 +8835,8 @@ void normal_mode_init() {
                     adc_oneshot_io_to_channel(gpio, NULL, &adc_channel);
                     
                     adc_oneshot_chan_cfg_t config = {
-                        .bitwidth = ADC_BITWIDTH_12,    // Max supported width: 12 bits (0 - 4095)
                         .atten = IO_GPIO_ADC_ATTENUATION,
+                        .bitwidth = ADC_BITWIDTH_12,    // Max supported width: 12 bits (0 - 4095)
                     };
                     gpio_ret = adc_oneshot_config_channel(main_config.adc_dac_data->adc_oneshot_handle, adc_channel, &config);
                     
diff --git a/HAA/HAA_Main/main/main.h b/HAA/HAA_Main/main/main.h
new file mode 100644
index 00000000..877bd6f1
--- /dev/null
+++ b/HAA/HAA_Main/main/main.h
@@ -0,0 +1,3 @@
+#pragma once
+
+void set_main_wifi_status_connecting();
diff --git a/HAA/HAA_Main/main/setup.html b/HAA/HAA_Main/main/setup.html
index e5cd188c..890f390f 100644
--- a/HAA/HAA_Main/main/setup.html
+++ b/HAA/HAA_Main/main/setup.html
@@ -39,7 +39,7 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <input type="checkbox" name="ins" value="y"> Installer Setup<br>
 <input type="checkbox" name="ota" value="y"> Firmware Update<br>
 <input type="checkbox" name="wap" value="y" <!-- part HTML_SETTINGS_WIFI_AP -->> WiFi AP<br>
-WiFi AP Password<input type="password" name="app" maxlength="63"/><br>
+WiFi AP Password<input type="password" name="app" maxlength="63"><br>
 <label> WiFi Mode <select name="wm">
 <option value="0" <!-- part HTML_WIFI_MODE_0 -->>Normal</option>
 <option value="1" <!-- part HTML_WIFI_MODE_1 -->>Force BSSID</option>
@@ -94,8 +94,8 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 <option value="48">48</option>
 @@@#endif
 </select></label></div>
-<input type="submit" id="join" value="Save"/><br><br>
-<input type="button" id="refresh" value="⟲ Search WiFi" onClick="window.location.reload(true)"/>
+<input type="submit" id="join" value="Save"><br><br>
+<input type="button" id="refresh" value="⟲ Search WiFi" onClick="window.location.reload(true)">
 Current: <!-- part HTML_SETTINGS_CURRENT_WIFI --><br>
 <div class="nonetworks" style="display:none;">
 None found
@@ -108,15 +108,15 @@ <h2>Please, support this project by <a href="https://paypal.me/ravensystem">dona
 </ul>
 <div class="field required ssid" style="display:none;">
 <label for="ssid">SSID</label>
-<input type="text" id="ssid" name="sid" maxlength="63"/>
+<input type="text" id="ssid" name="sid" maxlength="63">
 </div>
 <div class="field required pass" style="display:none;">
 <label for="pass">Password</label>
-<input type="password" id="pass" name="psw" maxlength="63"/>
+<input type="password" id="pass" name="psw" maxlength="63">
 </div>
 <div class="field bssid" style="display:none;">
 <label for="bssid">BSSID</label>
-<input type="text" id="bssid" name="bid" maxlength="12"/>
+<input type="text" id="bssid" name="bid" maxlength="12">
 </div></form>
 <center>© 2018-2023 Jos&eacute; A. Jim&eacute;nez Campos</center>
 <h2>If you have paid for this firmware or for a device with it installed, you have been scammed. You must report the fraud to the authorities and claim the amount paid. <a href="https://raw.githubusercontent.com/RavenSystem/esp-homekit-devices/master/LICENSE">LICENSE</a></h2>
@@ -154,7 +154,6 @@ <h2>If you have paid for this firmware or for a device with it installed, you ha
 hide(pass_block);
 disable(pass_field);
 pass_field.value="";
-show(bssid_block);
 enable(join_button);
 }
 }
diff --git a/libs/adv_i2c/adv_i2c.c b/libs/adv_i2c/adv_i2c.c
index 9e42e42f..94b8eb27 100644
--- a/libs/adv_i2c/adv_i2c.c
+++ b/libs/adv_i2c/adv_i2c.c
@@ -395,25 +395,25 @@ uint8_t i2c_read(uint8_t bus, bool ack)
 
 int private_adv_i2c_slave_write(uint8_t bus, uint8_t slave_addr, const uint8_t *data, const size_t data_len, const uint8_t *buf, size_t len, TickType_t xTicksToWait)
 {
-    xSemaphoreTake(i2c_bus[bus].lock, xTicksToWait);
-    
-    i2c_start(bus);
-    if (!i2c_write(bus, slave_addr << 1))
-        goto error;
-    if (data != NULL) {
-        for (unsigned int i = 0; i < data_len; i++) {
-            if (!i2c_write(bus, data[i]))
+    if (xSemaphoreTake(i2c_bus[bus].lock, xTicksToWait) == pdTRUE) {
+        i2c_start(bus);
+        if (!i2c_write(bus, slave_addr << 1))
+            goto error;
+        if (data != NULL) {
+            for (unsigned int i = 0; i < data_len; i++) {
+                if (!i2c_write(bus, data[i]))
+                    goto error;
+            }
+        }
+        while (len--) {
+            if (!i2c_write(bus, *buf++))
                 goto error;
         }
-    }
-    while (len--) {
-        if (!i2c_write(bus, *buf++))
+        if (!i2c_stop(bus))
             goto error;
+        
+        xSemaphoreGive(i2c_bus[bus].lock);
     }
-    if (!i2c_stop(bus))
-        goto error;
-    
-    xSemaphoreGive(i2c_bus[bus].lock);
     
     return 0;
 
@@ -426,29 +426,29 @@ int private_adv_i2c_slave_write(uint8_t bus, uint8_t slave_addr, const uint8_t *
 
 int private_adv_i2c_slave_read(uint8_t bus, uint8_t slave_addr, const uint8_t *data, const size_t data_len, uint8_t *buf, size_t len, TickType_t xTicksToWait)
 {
-    xSemaphoreTake(i2c_bus[bus].lock, xTicksToWait);
-    
-    if (data != NULL) {
+    if (xSemaphoreTake(i2c_bus[bus].lock, xTicksToWait) == pdTRUE) {
+        if (data != NULL) {
+            i2c_start(bus);
+            if (!i2c_write(bus, slave_addr << 1))
+                goto error;
+            for (unsigned int i = 0; i < data_len; i++) {
+                if (!i2c_write(bus, data[i]))
+                    goto error;
+            }
+        }
         i2c_start(bus);
-        if (!i2c_write(bus, slave_addr << 1))
+        if (!i2c_write(bus, slave_addr << 1 | 1)) // Slave address + read
             goto error;
-        for (unsigned int i = 0; i < data_len; i++) {
-            if (!i2c_write(bus, data[i]))
-                goto error;
+        while(len) {
+            *buf = i2c_read(bus, len == 1);
+            buf++;
+            len--;
         }
+        if (!i2c_stop(bus))
+            goto error;
+        
+        xSemaphoreGive(i2c_bus[bus].lock);
     }
-    i2c_start(bus);
-    if (!i2c_write(bus, slave_addr << 1 | 1)) // Slave address + read
-        goto error;
-    while(len) {
-        *buf = i2c_read(bus, len == 1);
-        buf++;
-        len--;
-    }
-    if (!i2c_stop(bus))
-        goto error;
-    
-    xSemaphoreGive(i2c_bus[bus].lock);
     
     return 0;
 
diff --git a/libs/adv_i2c/adv_i2c.h b/libs/adv_i2c/adv_i2c.h
index 337a1277..04be9d3f 100644
--- a/libs/adv_i2c/adv_i2c.h
+++ b/libs/adv_i2c/adv_i2c.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 
 #ifndef ADV_I2C_SEMAPHORE_TIMEOUT_MS
-#define ADV_I2C_SEMAPHORE_TIMEOUT_MS                (2000)
+#define ADV_I2C_SEMAPHORE_TIMEOUT_MS                (1000)
 #endif
 
 #define ADV_I2C_SEMAPHORE_TIMEOUT                   (ADV_I2C_SEMAPHORE_TIMEOUT_MS / portTICK_PERIOD_MS)
diff --git a/libs/adv_i2c/adv_i2c_idf.c b/libs/adv_i2c/adv_i2c_idf.c
index b5cc378f..4d98fbbd 100644
--- a/libs/adv_i2c/adv_i2c_idf.c
+++ b/libs/adv_i2c/adv_i2c_idf.c
@@ -13,11 +13,7 @@
 
 #include "adv_i2c.h"
 
-static SemaphoreHandle_t adv_i2c_bus_lock[I2C_MAX_BUS];
-
 int adv_i2c_init_hz(uint8_t bus, uint8_t scl_pin, uint8_t sda_pin, uint32_t freq, bool scl_pin_pullup, bool sda_pin_pullup) {
-    adv_i2c_bus_lock[bus] = xSemaphoreCreateMutex();
-    
     gpio_reset_pin(scl_pin);
     gpio_reset_pin(sda_pin);
     
@@ -31,31 +27,16 @@ int adv_i2c_init_hz(uint8_t bus, uint8_t scl_pin, uint8_t sda_pin, uint32_t freq
         .clk_flags = 0,
     };
     
-    esp_err_t res;
+    esp_err_t res = i2c_param_config(bus, &i2c_config);
     
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 1, 0)
-    // See https://github.com/espressif/esp-idf/issues/10163
-    if ((res = i2c_driver_install(bus, i2c_config.mode, 0, 0, 0)) != ESP_OK) {
-        return res;
-    }
-    if ((res = i2c_param_config(bus, &i2c_config)) != ESP_OK) {
-        return res;
-    }
-#else
-    if ((res = i2c_param_config(bus, &i2c_config)) != ESP_OK) {
-        return res;
+    if (res == ESP_OK) {
+        res = i2c_driver_install(bus, i2c_config.mode, 0, 0, ESP_INTR_FLAG_IRAM);
     }
-    if ((res = i2c_driver_install(bus, i2c_config.mode, 0, 0, 0)) != ESP_OK) {
-        return res;
-    }
-#endif
     
-    return ESP_OK;
+    return res;
 }
 
 static int private_adv_i2c_slave_read(uint8_t bus, uint8_t slave_addr, const uint8_t *data, const size_t data_len, uint8_t *buf, size_t len, TickType_t xTicksToWait) {
-    xSemaphoreTake(adv_i2c_bus_lock[bus], xTicksToWait);
-
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
     
     if (data && data_len) {
@@ -68,18 +49,15 @@ static int private_adv_i2c_slave_read(uint8_t bus, uint8_t slave_addr, const uin
     i2c_master_write_byte(cmd, (slave_addr << 1) | 1, true);
     i2c_master_read(cmd, buf, len, I2C_MASTER_LAST_NACK);
     i2c_master_stop(cmd);
-
-    esp_err_t res = i2c_master_cmd_begin(bus, cmd, xTicksToWait >> 1);
-
+    
+    esp_err_t res = i2c_master_cmd_begin(bus, cmd, xTicksToWait);
+    
     i2c_cmd_link_delete(cmd);
-
-    xSemaphoreGive(adv_i2c_bus_lock[bus]);
+    
     return res;
 }
 
 static int private_adv_i2c_slave_write(uint8_t bus, uint8_t slave_addr, const uint8_t *data, const size_t data_len, const uint8_t *buf, size_t len, TickType_t xTicksToWait) {
-    xSemaphoreTake(adv_i2c_bus_lock[bus], xTicksToWait);
-    
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
     i2c_master_start(cmd);
     i2c_master_write_byte(cmd, slave_addr << 1, true);
@@ -91,11 +69,10 @@ static int private_adv_i2c_slave_write(uint8_t bus, uint8_t slave_addr, const ui
     i2c_master_write(cmd, (void*) buf, len, true);
     i2c_master_stop(cmd);
     
-    esp_err_t res = i2c_master_cmd_begin(bus, cmd, xTicksToWait >> 1);
+    esp_err_t res = i2c_master_cmd_begin(bus, cmd, xTicksToWait);
     
     i2c_cmd_link_delete(cmd);
-    
-    xSemaphoreGive(adv_i2c_bus_lock[bus]);
+        
     return res;
 }
 
diff --git a/libs/adv_logger_ntp/adv_logger_ntp.c b/libs/adv_logger_ntp/adv_logger_ntp.c
index a4543bd4..d185b569 100644
--- a/libs/adv_logger_ntp/adv_logger_ntp.c
+++ b/libs/adv_logger_ntp/adv_logger_ntp.c
@@ -309,6 +309,8 @@ static void adv_logger_init_task(void* args) {
         vTaskDelay(pdMS_TO_TICKS(200));
     }
     
+    free(args);     // destination and port
+    
     while ((adv_logger_data->socket = lwip_socket(adv_logger_data->res->ai_family, adv_logger_data->res->ai_socktype, 0)) < 0) {
         vTaskDelay(pdMS_TO_TICKS(200));
     }
@@ -323,7 +325,7 @@ static void adv_logger_init_task(void* args) {
     
     strcat(adv_logger_data->udplogstring, "\r\nAdvanced ESP Logger (c) 2022-2023 José A. Jiménez Campos\r\n\r\n");
     adv_logger_data->udplogstring_len = strlen(adv_logger_data->udplogstring);
-
+    
     if (adv_logger_data->is_buffered) {
         xTaskCreate(adv_logger_buffered_task, "LOG", ADV_LOGGER_BUFFERED_TASK_SIZE, NULL, ADV_LOGGER_BUFFERED_TASK_PRIORITY, &adv_logger_data->xHandle);
     }
@@ -331,8 +333,6 @@ static void adv_logger_init_task(void* args) {
     adv_logger_data->is_new_line = true;
     adv_logger_data->ready_to_send = true;
     
-    free(args);
-    
     vTaskDelete(NULL);
 }
 
diff --git a/libs/homekit-rsf/include/homekit/homekit.h b/libs/homekit-rsf/include/homekit/homekit.h
index 4c1a91d0..0526415e 100644
--- a/libs/homekit-rsf/include/homekit/homekit.h
+++ b/libs/homekit-rsf/include/homekit/homekit.h
@@ -64,8 +64,8 @@ void homekit_server_reset();
 void homekit_remove_extra_pairing(const int last_keep);
 int homekit_pairing_count();
 
-void homekit_mdns_announce();
-void homekit_mdns_announce_pause();
+void homekit_mdns_announce_start();
+void homekit_mdns_announce_stop();
 
 int homekit_get_accessory_id(char *buffer, size_t size);
 bool homekit_is_pairing();
diff --git a/libs/homekit-rsf/src/mdnsresponder.c b/libs/homekit-rsf/src/mdnsresponder.c
index c33289e6..0d474bc1 100644
--- a/libs/homekit-rsf/src/mdnsresponder.c
+++ b/libs/homekit-rsf/src/mdnsresponder.c
@@ -490,7 +490,7 @@ void mdns_buffer_deinit() {
 }
 
 void mdns_clear() {
-    rs_esp_timer_stop_forced(mdns_announce_timer);
+    mdns_announce_stop();
     
     if (!xSemaphoreTake(gDictMutex, portMAX_DELAY))
         return;
@@ -612,7 +612,7 @@ void mdns_add_AAAA(const char* rKey, u32_t ttl, const ip6_addr_t *addr)
 }
 #endif
 
-void mdns_announce() {
+static void mdns_announce() {
     if (mdns_status == MDNS_STATUS_WORKING) {
         mdns_status = MDNS_STATUS_PROBING_1;
         rs_esp_timer_change_period(mdns_announce_timer, MDNS_TTL_SAFE_MARGIN * MDNS_TTL_MULTIPLIER_MS);
@@ -644,9 +644,14 @@ void mdns_announce() {
 #endif
 }
 
-void mdns_announce_pause() {
-    rs_esp_timer_stop(mdns_announce_timer);
+void mdns_announce_stop() {
+    rs_esp_timer_stop_forced(mdns_announce_timer);
+}
+
+void mdns_announce_start() {
+    rs_esp_timer_change_period_forced(mdns_announce_timer, MDNS_TTL_SAFE_MARGIN * MDNS_TTL_MULTIPLIER_MS);
     mdns_status = MDNS_STATUS_WORKING;
+    mdns_announce();
 }
 
 void mdns_add_facility_work(const char* instanceName,   // Friendly name, need not be unique
@@ -711,7 +716,7 @@ void mdns_add_facility_work(const char* instanceName,   // Friendly name, need n
 
     mdns_announce_timer = rs_esp_timer_create((MDNS_TTL_SAFE_MARGIN * MDNS_TTL_MULTIPLIER_MS), true, NULL, mdns_announce);
     
-    mdns_announce();
+    mdns_announce_start();
 }
 
 void mdns_add_facility(const char* instanceName,   // Friendly name, need not be unique
diff --git a/libs/homekit-rsf/src/mdnsresponder.h b/libs/homekit-rsf/src/mdnsresponder.h
index 3cd7938b..5f8a7780 100644
--- a/libs/homekit-rsf/src/mdnsresponder.h
+++ b/libs/homekit-rsf/src/mdnsresponder.h
@@ -37,8 +37,8 @@ typedef enum {
 // Clear all records
 void mdns_clear();
 
-void mdns_announce();
-void mdns_announce_pause();
+void mdns_announce_start();
+void mdns_announce_stop();
 
 void mdns_add_facility( const char* instanceName,   // Short user-friendly instance name, should NOT include serial number/MAC/etc
                         const char* serviceName,    // Must be registered, _name, (see RFC6335 5.1 & 5.2)
diff --git a/libs/homekit-rsf/src/port.c b/libs/homekit-rsf/src/port.c
index 076ea925..f9df77cf 100644
--- a/libs/homekit-rsf/src/port.c
+++ b/libs/homekit-rsf/src/port.c
@@ -114,10 +114,10 @@ void homekit_mdns_configure_finalize(const uint16_t mdns_ttl, const uint16_t mdn
 #endif
 }
 
-void homekit_port_mdns_announce() {
-    mdns_announce();
+void homekit_port_mdns_announce_start() {
+    mdns_announce_start();
 }
 
-void homekit_port_mdns_announce_pause() {
-    mdns_announce_pause();
+void homekit_port_mdns_announce_stop() {
+    mdns_announce_stop();
 }
diff --git a/libs/homekit-rsf/src/port.h b/libs/homekit-rsf/src/port.h
index cdfe55e4..cbf55037 100644
--- a/libs/homekit-rsf/src/port.h
+++ b/libs/homekit-rsf/src/port.h
@@ -30,8 +30,8 @@ void homekit_random_fill(uint8_t *data, size_t size);
 
 #define SERVER_TASK_PRIORITY                (tskIDLE_PRIORITY + 2)
 
-void homekit_port_mdns_announce();
-void homekit_port_mdns_announce_pause();
+void homekit_port_mdns_announce_start();
+void homekit_port_mdns_announce_stop();
 
 void homekit_mdns_init();
 void homekit_mdns_buffer_set(const uint16_t size);
diff --git a/libs/homekit-rsf/src/server.c b/libs/homekit-rsf/src/server.c
index c300cacd..788c0faf 100644
--- a/libs/homekit-rsf/src/server.c
+++ b/libs/homekit-rsf/src/server.c
@@ -3770,12 +3770,12 @@ int homekit_pairing_count() {
     return homekit_storage_pairing_count();
 }
 
-void homekit_mdns_announce() {
-    homekit_port_mdns_announce();
+void homekit_mdns_announce_stop() {
+    homekit_port_mdns_announce_stop();
 }
 
-void homekit_mdns_announce_pause() {
-    homekit_port_mdns_announce_pause();
+void homekit_mdns_announce_start() {
+    homekit_port_mdns_announce_start();
 }
 
 bool homekit_is_paired() {
diff --git a/libs/new_dht/dht.c b/libs/new_dht/dht.c
index 83ae342f..58c8d940 100644
--- a/libs/new_dht/dht.c
+++ b/libs/new_dht/dht.c
@@ -191,31 +191,32 @@ bool dht_read_data(dht_sensor_type_t sensor_type, uint8_t pin, int16_t *humidity
     uint8_t data[DHT_DATA_BITS / 8] = { 0 };
     bool result = false;
     
-    xSemaphoreTake(dht_lock, pdMS_TO_TICKS(DHT_TIMEOUT_MS));
-    
+    if (xSemaphoreTake(dht_lock, pdMS_TO_TICKS(DHT_TIMEOUT_MS)) == pdTRUE) {
+        
 #ifdef ESP_PLATFORM
-    gpio_set_direction(pin, GPIO_MODE_OUTPUT_OD);
-    gpio_set_pull_mode(pin, false);
-    gpio_sleep_set_pull_mode(pin, false);
+        gpio_set_direction(pin, GPIO_MODE_OUTPUT_OD);
+        gpio_set_pull_mode(pin, false);
+        gpio_sleep_set_pull_mode(pin, false);
 #else
-    gpio_enable(pin, GPIO_OUT_OPEN_DRAIN);
-    gpio_set_pullup(pin, false, false);
+        gpio_enable(pin, GPIO_OUT_OPEN_DRAIN);
+        gpio_set_pullup(pin, false, false);
 #endif
-    
-    PORT_ENTER_CRITICAL();
-    result = dht_fetch_data(sensor_type, pin, bits);
-    PORT_EXIT_CRITICAL();
-
+        
+        PORT_ENTER_CRITICAL();
+        result = dht_fetch_data(sensor_type, pin, bits);
+        PORT_EXIT_CRITICAL();
+        
 #ifdef ESP_PLATFORM
-    gpio_reset_pin(pin);
-    gpio_set_direction(pin, GPIO_MODE_DISABLE);
+        gpio_reset_pin(pin);
+        gpio_set_direction(pin, GPIO_MODE_DISABLE);
 #else
-    gpio_enable(pin, GPIO_INPUT);
+        gpio_enable(pin, GPIO_INPUT);
 #endif
-    
-    vTaskDelay(pdMS_TO_TICKS(50));
-    
-    xSemaphoreGive(dht_lock);
+        
+        vTaskDelay(pdMS_TO_TICKS(50));
+        
+        xSemaphoreGive(dht_lock);
+    }
     
     if (!result) {
         return false;