diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1c29602..16348fe1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,6 +57,8 @@ elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
     set(ALL_COMPILER_FLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS}")
 elseif(CMAKE_BUILD_TYPE MATCHES MinSizeRel)
     set(ALL_COMPILER_FLAGS "${CMAKE_CXX_FLAGS_MINSIZEREL} ${CMAKE_CXX_FLAGS}")
+    # 'EMBEDDED is used to disable/minimise code features for embedded systems (e.g. code-size, console printouts, etc.)
+    add_compile_definitions(EMBEDDED)
 endif()
 # Replace ; with space
 string(REPLACE ";" " " ALL_COMPILER_FLAGS "${ALL_COMPILER_FLAGS}")
@@ -68,6 +70,13 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     add_compile_options(-fdiagnostics-color=always)
 endif()
 
+# Include What You Use tooling: https://github.com/include-what-you-use/include-what-you-use
+find_program(INCLUDE_WHAT_YOU_USE_TOOL_PATH NAMES include-what-you-use iwyu)
+if(INCLUDE_WHAT_YOU_USE_TOOL_PATH)
+    message(" using 'Include What You Use' path: (${INCLUDE_WHAT_YOU_USE_TOOL_PATH})")
+    set_property(GLOBAL PROPERTY CMAKE_CXX_INCLUDE_WHAT_YOU_USE ${INCLUDE_WHAT_YOU_USE_TOOL_PATH})
+endif()
+
 # Mainly for FMT
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
diff --git a/blocks/basic/test/qa_PythonBlock.cpp b/blocks/basic/test/qa_PythonBlock.cpp
index fef93619..8793245b 100644
--- a/blocks/basic/test/qa_PythonBlock.cpp
+++ b/blocks/basic/test/qa_PythonBlock.cpp
@@ -136,7 +136,7 @@ def process_bulk(ins, outs):
 
         bool throws = false;
         try {
-            myBlock.applyChangedSettings(); // needed for unit-test only when executed outside a Scheduler/Graph
+            myBlock.settings().applyStagedParameters(); // needed for unit-test only when executed outside a Scheduler/Graph
         } catch (const std::exception &ex) {
             throws = true;
             fmt::println("myBlock.processBulk(...) - correctly threw SyntaxError exception:\n {}", ex.what());
diff --git a/core/include/gnuradio-4.0/Tag.hpp b/core/include/gnuradio-4.0/Tag.hpp
index 3a3042af..b8235698 100644
--- a/core/include/gnuradio-4.0/Tag.hpp
+++ b/core/include/gnuradio-4.0/Tag.hpp
@@ -5,6 +5,8 @@
 
 #include <pmtv/pmt.hpp>
 
+#include <pmtv/format.hpp>
+
 #include <gnuradio-4.0/meta/utils.hpp>
 
 #include "reflection.hpp"