diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ca6671..a8d94fa2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,16 +162,18 @@ else()
 	set(TARGET_STRING "Target BSP: Hosted")
 endif()
 
+string(CONCAT POST_BUILD_COMMENT
+    "Build directory: ${CMAKE_BINARY_DIR}\n"
+    "Target OSAL: ${OS_FSFW}\n"
+    "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
+    "${TARGET_STRING}"
+)
+
 add_custom_command(
    TARGET ${TARGET_NAME}
    POST_BUILD
-   #COMMAND echo "Build directory: ${CMAKE_BINARY_DIR}"
-   #COMMAND echo "Target OSAL: ${OS_FSFW}"
-   #COMMAND echo "Target Build Type: ${CMAKE_BUILD_TYPE}"
-   #COMMAND echo "${TARGET_STRING}"
    COMMAND ${CMAKE_SIZE} ${TARGET_NAME}${FILE_SUFFIX}
-   COMMENT "Build directory: ${CMAKE_BINARY_DIR}\nTarget OSAL: ${OS_FSFW}\n"
-           "Target Build Type: ${CMAKE_BUILD_TYPE}\n${TARGET_STRING}"
+   COMMENT ${POST_BUILD_COMMENT}
 )
 
 include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
diff --git a/fsfw b/fsfw
index 8c5e261a..c2839825 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 8c5e261a0db46e53a7655c98766ebd65a13dc10a
+Subproject commit c28398257b68facbabb19d7228b045f1388305df
diff --git a/tmtc b/tmtc
index 361eb39a..c10fbe7f 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 361eb39aa12cf99cc6fd3931dc829d5de6a09b94
+Subproject commit c10fbe7fbec6b32ceb725da62e18e4db5dc112a7