diff --git a/cmake/PreProjectConfig.cmake b/cmake/PreProjectConfig.cmake
index f4808ce8..df1d92b4 100644
--- a/cmake/PreProjectConfig.cmake
+++ b/cmake/PreProjectConfig.cmake
@@ -89,7 +89,7 @@ endif()
 if(FSFW_OSAL MATCHES linux AND TGT_BSP AND EIVE_HARDCODED_TOOLCHAIN_FILE)
 	if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/te0720-1cfa")
 		set(CMAKE_TOOLCHAIN_FILE 
-			${CMAKE_CURRENT_SOURCE_DIR}/cmake/Zynq7020CrossCompileConfig.cmake"
+			"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Zynq7020CrossCompileConfig.cmake"
 			PARENT_SCOPE
 		)
 	elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
diff --git a/fsfw b/fsfw
index 707a43ab..24ef96d1 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 707a43aba98ea00a1fd5ab73642c357b7a36a7ad
+Subproject commit 24ef96d1b802e768d395f94b69f9f81a3c6d1e66