diff --git a/lib/ccs811_tvoc/ccs811_tvoc.c b/lib/ccs811_tvoc/ccs811_tvoc.c
index 9936fcc..daba680 100644
--- a/lib/ccs811_tvoc/ccs811_tvoc.c
+++ b/lib/ccs811_tvoc/ccs811_tvoc.c
@@ -26,7 +26,7 @@ ccs811_ret_t ccs811_read_baseline(ccs811_t *ccs, uint8_t *baseline) {
     return CCS_OK;
 }
 
-ccs811_ret_t ccs811_store_baseline(ccs811_t *ccs, uint8_t *baseline) {
+ccs811_ret_t ccs811_restore_baseline(ccs811_t *ccs, uint8_t *baseline) {
     ccs->cb.write_register_cb(ccs->user_data, 0x11, baseline, 0x02);
     return CCS_OK;
 }
diff --git a/lib/ccs811_tvoc/ccs811_tvoc.h b/lib/ccs811_tvoc/ccs811_tvoc.h
index 24878fe..cd66b1d 100644
--- a/lib/ccs811_tvoc/ccs811_tvoc.h
+++ b/lib/ccs811_tvoc/ccs811_tvoc.h
@@ -28,7 +28,7 @@ typedef struct {
 ccs811_ret_t ccs811_init(ccs811_t *ccs);
 ccs811_ret_t ccs811_set_env_data(ccs811_t *ccs, double temperature, double humidity);
 ccs811_ret_t ccs811_read_baseline(ccs811_t *ccs, uint8_t *baseline);
-ccs811_ret_t ccs811_store_baseline(ccs811_t *ccs, uint8_t *baseline);
+ccs811_ret_t ccs811_restore_baseline(ccs811_t *ccs, uint8_t *baseline);
 ccs811_ret_t ccs811_measure(ccs811_t *ccs, ccs811_result_t *result);
 
 #endif
\ No newline at end of file
diff --git a/src/impl/user_mqtt_impl.c b/src/impl/user_mqtt_impl.c
index c9565a0..d84581d 100644
--- a/src/impl/user_mqtt_impl.c
+++ b/src/impl/user_mqtt_impl.c
@@ -278,6 +278,7 @@ int user_mqtt_impl_init(user_mqtt_impl_t *handle) {
  * @return 0 if success, negative value if error.
  */
 int user_mqtt_impl_deinit(user_mqtt_impl_t *handle) {
+    handle->ready = false;
     mosquitto_disconnect(handle->mosq);
     mosquitto_destroy(handle->mosq);
     mosquitto_lib_cleanup();
diff --git a/src/tasks/user_mqtt_task.c b/src/tasks/user_mqtt_task.c
index 01688fd..423cac8 100644
--- a/src/tasks/user_mqtt_task.c
+++ b/src/tasks/user_mqtt_task.c
@@ -58,5 +58,7 @@ void *user_mqtt_task(void *arguments) {
         usleep(5 * 1000);
     }
 
+    user_mqtt_impl_deinit(&s_mqtt_impl);
+
     return NULL;
 }
\ No newline at end of file
diff --git a/src/tasks/user_tvoc_task.c b/src/tasks/user_tvoc_task.c
index 9bf84c2..66a898d 100644
--- a/src/tasks/user_tvoc_task.c
+++ b/src/tasks/user_tvoc_task.c
@@ -51,6 +51,7 @@ void *user_tvoc_task(void *arguments) {
     while(g_running) {
         ccs811_result_t result;
         ccs811_measure(&ccs, &result);
+        USER_LOG(USER_LOG_INFO, "CCS: eTVOC: %dppb, eCO2: %dppm", result.tvoc, result.eco2);
         sleep(1);
     }