diff --git a/src/drivers/st67w6.c b/src/drivers/st67w6.c
index 3790020b..af576dff 100644
--- a/src/drivers/st67w6.c
+++ b/src/drivers/st67w6.c
@@ -365,7 +365,7 @@ static bool st67w6_init(uint8_t *mac) {
   }
   // set clock, who cares ???
   if (!st67w6_at_cmd("AT+GET_CLOCK\r\n", 14)) return false;
-  MG_DEBUG(("%.*s", s_at_resp_len, at_resp));  // TODO(scaprile): --> VERBOSE
+  MG_VERBOSE(("%.*s", s_at_resp_len, at_resp));
   // BT-ENABLED DEPENDENCY
 
   // MODULE DEPENDENCY
diff --git a/tutorials/esp32/minimal/Makefile b/tutorials/esp32/minimal/Makefile
index 232eec2f..fb044734 100644
--- a/tutorials/esp32/minimal/Makefile
+++ b/tutorials/esp32/minimal/Makefile
@@ -1,9 +1,11 @@
 THISDIR = $(realpath $(CURDIR))
 ROOTDIR = $(realpath $(CURDIR)/../../..)
 DOCKER ?= docker run --rm $(DA) -v $(ROOTDIR):$(ROOTDIR) -w $(THISDIR) espressif/idf
-CMD ?= idf.py build
+CMD ?= idf.py -DCFLAGS_EXTRA="$(CFLAGS_EXTRA)" build
 PORT ?= /dev/ttyUSB0
 
+CFLAGS_EXTRA ?= -DMG_TLS=MG_TLS_BUILTIN
+
 all: example
 
 example:
diff --git a/tutorials/esp32/minimal/main/CMakeLists.txt b/tutorials/esp32/minimal/main/CMakeLists.txt
index 07e56cb1..f5ef5fd1 100644
--- a/tutorials/esp32/minimal/main/CMakeLists.txt
+++ b/tutorials/esp32/minimal/main/CMakeLists.txt
@@ -12,3 +12,5 @@ idf_component_register(SRCS "main.c"
                                 espcoredump
                                 nvs_flash
                                 app_update)
+separate_arguments(CFLAGS_EXTRA)
+component_compile_options(${CFLAGS_EXTRA})
diff --git a/tutorials/esp32/minimal/main/mongoose_config.h b/tutorials/esp32/minimal/main/mongoose_config.h
index d7a026cb..910630d4 100644
--- a/tutorials/esp32/minimal/main/mongoose_config.h
+++ b/tutorials/esp32/minimal/main/mongoose_config.h
@@ -1,4 +1 @@
 #define MG_ARCH MG_ARCH_ESP32
-
-#define MG_TLS MG_TLS_BUILTIN
-//#define MG_TLS MG_TLS_MBED
diff --git a/tutorials/micropython/mongoose/module.c b/tutorials/micropython/mongoose/module.c
index 7d38a2ce..d4ca51de 100644
--- a/tutorials/micropython/mongoose/module.c
+++ b/tutorials/micropython/mongoose/module.c
@@ -3,24 +3,24 @@
 extern void mgmp_init(void);
 extern void mgmp_poll(int);
 
-STATIC mp_obj_t mongoose_init(void) {
+static mp_obj_t mongoose_init(void) {
     mgmp_init();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mongoose_init_obj, mongoose_init);
+static MP_DEFINE_CONST_FUN_OBJ_0(mongoose_init_obj, mongoose_init);
 
-STATIC mp_obj_t mongoose_poll(mp_obj_t t_obj) {
+static mp_obj_t mongoose_poll(mp_obj_t t_obj) {
     mgmp_poll(mp_obj_get_int(t_obj));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mongoose_poll_obj, mongoose_poll);
+static MP_DEFINE_CONST_FUN_OBJ_1(mongoose_poll_obj, mongoose_poll);
 
-STATIC const mp_rom_map_elem_t mongoose_module_globals_table[] = {
+static const mp_rom_map_elem_t mongoose_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_mongoose) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&mongoose_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&mongoose_poll_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(mongoose_module_globals, mongoose_module_globals_table);
+static MP_DEFINE_CONST_DICT(mongoose_module_globals, mongoose_module_globals_table);
 
 const mp_obj_module_t mongoose_module = {
     .base = { &mp_type_module },