diff --git a/components/bt/test/CMakeLists.txt b/components/bt/test/CMakeLists.txt
index c8c2dda4b9..e59c45744a 100644
--- a/components/bt/test/CMakeLists.txt
+++ b/components/bt/test/CMakeLists.txt
@@ -1,8 +1,7 @@
-if(CONFIG_BT_ENABLED)
+if(CONFIG_BT_ENABLED OR CMAKE_BUILD_EARLY_EXPANSION)
     set(COMPONENT_SRCDIRS ".")
     set(COMPONENT_ADD_INCLUDEDIRS ".")
+    set(COMPONENT_REQUIRES unity nvs_flash bt)
+
+    register_component()
 endif()
-
-set(COMPONENT_REQUIRES unity nvs_flash bt)
-
-register_component()
diff --git a/docs/en/api-reference/protocols/modbus.rst b/docs/en/api-reference/protocols/modbus.rst
index 3c93bae6c1..d4945d13a9 100644
--- a/docs/en/api-reference/protocols/modbus.rst
+++ b/docs/en/api-reference/protocols/modbus.rst
@@ -18,7 +18,7 @@ Modbus slave interface API overview
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-ISP-IDF supports Modbus slave protocol and provides modbus_controller interface API to interact with user application. The interface API functions below are used to setup and use Modbus slave stack from application and could be executed in next order:
+ESP-IDF supports Modbus slave protocol and provides modbus_controller interface API to interact with user application. The interface API functions below are used to setup and use Modbus slave stack from application and could be executed in next order:
 
 
 The files deviceparams.c/h contain the user structures which represent Modbus parameters accessed by stack. These parameters should be prepared by user and be assigned to the modbus_controller interface using :cpp:func:`mbcontroller_set_descriptor()` API call before start of communication.