diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2fbcf0fb..eac61b84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,8 +25,10 @@ if(NOT FSFW_OSAL)
 endif()
 
 if(TGT_BSP)
-    if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
+    if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
         option(LINUX_CROSS_COMPILE ON)
+    endif()
+    if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
         option(EIVE_BUILD_GPSD_GPS_HANDLER "Build GPSD dependent GPS Handler" OFF)
     elseif(TGT_BSP MATCHES "arm/q7s")
         option(EIVE_Q7S_EM "Build configuration for the EM" OFF)
@@ -296,6 +298,7 @@ target_include_directories(${WATCHDOG_NAME} PUBLIC
 )
 
 # unittests
+f(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
 add_executable(${UNITTEST_NAME} EXCLUDE_FROM_ALL)
 
 if(EIVE_ADD_ETL_LIB)
diff --git a/README.md b/README.md
index ec2d74c2..d3614e07 100644
--- a/README.md
+++ b/README.md
@@ -209,7 +209,7 @@ You can also use the FSFW OSAL `host` to build on Windows or for generic OSes.
 Note: Currently this is not supported.
 
 ```sh
-mkdir build-Debug-Host && cd build-Debug-Host
+mkdir cmake-build-debug && cd cmake-build-debug
 cmake -DFSFW_OSAL=host -DCMAKE_BUILD_TYPE=Debug ..
 cmake --build . -j
 ```
@@ -220,7 +220,7 @@ To build the unittests, the corresponding target must be specified in the build
 The configure steps do not need to be repeated if the folder has already been configured.
 
 ```sh
-mkdir build-Debug-Unittest && cd build-Debug-Unittest
+mkdir cmake-build-debug && cd cmake-build-debug
 cmake ..
 cmake --build . --target eive-unittests -j
 ```