diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddf101a4..97b7601c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,7 +233,7 @@ set(LIB_ARCSEC_PATH ${THIRD_PARTY_FOLDER}/arcsec_star_tracker)
 set(LIB_JSON_PATH ${THIRD_PARTY_FOLDER}/json)
 
 set(FSFW_WARNING_SHADOW_LOCAL_GCC OFF)
-set(EIVE_ADD_LINUX_FILES False)
+set(EIVE_ADD_LINUX_FILES OFF)
 
 # Analyse different OS and architecture/target options, determine BSP_PATH,
 # display information about compiler etc.
@@ -253,12 +253,15 @@ if(TGT_BSP)
     set(FSFW_CONFIG_PATH "linux/fsfwconfig")
     if(NOT BUILD_Q7S_SIMPLE_MODE)
       set(EIVE_ADD_LINUX_FILES TRUE)
+      set(EIVE_ADD_LINUX_FSFWCONFIG TRUE)
       set(ADD_GOMSPACE_CSP TRUE)
       set(ADD_GOMSPACE_CLIENTS TRUE)
       set(FSFW_HAL_ADD_LINUX ON)
       set(FSFW_HAL_LINUX_ADD_LIBGPIOD ON)
       set(FSFW_HAL_LINUX_ADD_PERIPHERAL_DRIVERS ON)
     endif()
+  elseif(UNIX)
+    set(EIVE_ADD_LINUX_FILES ON)
   endif()
 
   if(TGT_BSP MATCHES "arm/raspberrypi")
@@ -393,7 +396,7 @@ if(EIVE_ADD_JSON_LIB)
   add_subdirectory(${LIB_JSON_PATH})
 endif()
 
-add_subdirectory(thirdparty/rapidcsv)
+add_subdirectory(thirdparty)
 
 if(EIVE_ADD_LINUX_FILES)
   add_subdirectory(${LIB_ARCSEC_PATH})
diff --git a/bsp_linux_board/CMakeLists.txt b/bsp_linux_board/CMakeLists.txt
index c1817ac1..39f06401 100644
--- a/bsp_linux_board/CMakeLists.txt
+++ b/bsp_linux_board/CMakeLists.txt
@@ -3,3 +3,4 @@ target_sources(${OBSW_NAME} PUBLIC InitMission.cpp main.cpp gpioInit.cpp
 
 add_subdirectory(boardconfig)
 add_subdirectory(boardtest)
+add_subdirectory(fsfwconfig)
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index d7e6ca93..f8c8935f 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -3,7 +3,10 @@ add_subdirectory(utility)
 add_subdirectory(callbacks)
 add_subdirectory(boardtest)
 add_subdirectory(devices)
-add_subdirectory(fsfwconfig)
 add_subdirectory(ipcore)
 
+if(EIVE_ADD_LINUX_FSFWCONFIG)
+  add_subdirectory(fsfwconfig)
+endif()
+
 target_sources(${OBSW_NAME} PUBLIC ObjectFactory.cpp InitMission.cpp)
diff --git a/linux/InitMission.cpp b/linux/InitMission.cpp
index 5bc8698c..4b7dc1f1 100644
--- a/linux/InitMission.cpp
+++ b/linux/InitMission.cpp
@@ -6,6 +6,7 @@
 
 #include "OBSWConfig.h"
 #include "ObjectFactory.h"
+#include "eive/objects.h"
 
 void scheduling::schedulingScex(TaskFactory& factory, PeriodicTaskIF*& scexDevHandler,
                                 PeriodicTaskIF*& scexReaderTask) {
diff --git a/linux/boardtest/SpiTestClass.cpp b/linux/boardtest/SpiTestClass.cpp
index dc5a5e3b..91e8893c 100644
--- a/linux/boardtest/SpiTestClass.cpp
+++ b/linux/boardtest/SpiTestClass.cpp
@@ -333,14 +333,12 @@ void SpiTestClass::performPeriodicMax1227Test() {
 }
 
 void SpiTestClass::performMax1227Test() {
+  std::string deviceName = "";
 #ifdef XIPHOS_Q7S
-  std::string deviceName = q7s::SPI_DEFAULT_DEV;
+  deviceName = q7s::SPI_DEFAULT_DEV;
 #elif defined(RASPBERRY_PI)
-  std::string deviceName = "";
 #elif defined(EGSE)
-  std::string deviceName = "";
 #elif defined(TE0720_1CFA)
-  std::string deviceName = "";
 #endif
   int fd = 0;
   UnixFileGuard fileHelper(deviceName, &fd, O_RDWR, "SpiComIF::initializeInterface");
@@ -381,8 +379,9 @@ void SpiTestClass::max1227RadSensorTest(int fd) {
                                             DiffSel::NONE_0);
     spiTransferStruct[0].len = 1;
     transfer(fd, gpioIds::CS_RAD_SENSOR);
-    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), 7, spiTransferStruct[0].len);
-    size_t tmpLen = spiTransferStruct[0].len;
+    size_t tmpSz = spiTransferStruct[0].len;
+    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), 7, tmpSz);
+    size_t tmpLen = tmpSz;
     spiTransferStruct[0].len = 1;
     transfer(fd, gpioIds::CS_RAD_SENSOR);
     std::memcpy(sendBuffer.data(), sendBuffer.data() + 1, tmpLen - 1);
@@ -403,7 +402,8 @@ void SpiTestClass::max1227RadSensorTest(int fd) {
     for (int idx = 0; idx < 8; idx++) {
       sif::info << "ADC raw " << idx << ": " << adcRaw[idx] << std::endl;
     }
-    max1227::prepareExternallyClockedTemperatureRead(sendBuffer.data(), spiTransferStruct[0].len);
+    tmpSz = spiTransferStruct[0].len;
+    max1227::prepareExternallyClockedTemperatureRead(sendBuffer.data(), tmpSz);
     spiTransferStruct[0].len = 1;
     transfer(fd, gpioIds::CS_RAD_SENSOR);
     usleep(65);
@@ -467,7 +467,8 @@ void SpiTestClass::max1227SusTest(int fd, SusTestCfg &cfg) {
     spiTransferStruct[0].len = 1;
     transfer(fd, cfg.gpioId);
 
-    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), 5, spiTransferStruct[0].len);
+    size_t tmpSz = spiTransferStruct[0].len;
+    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), 5, tmpSz);
     transfer(fd, cfg.gpioId);
     uint16_t adcRaw[6] = {};
     adcRaw[0] = (recvBuffer[1] << 8) | recvBuffer[2];
@@ -552,7 +553,9 @@ void SpiTestClass::max1227PlPcduTest(int fd) {
     spiTransferStruct[0].len = 1;
     transfer(fd, gpioIds::PLPCDU_ADC_CS);
     uint8_t n = 11;
-    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), n, spiTransferStruct[0].len);
+    size_t tmpSz = spiTransferStruct[0].len;
+    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), n, tmpSz);
+    spiTransferStruct[0].len = tmpSz;
     size_t dummy = 0;
     max1227::prepareExternallyClockedTemperatureRead(sendBuffer.data() + spiTransferStruct[0].len,
                                                      dummy);
@@ -585,9 +588,11 @@ void SpiTestClass::max1227PlPcduTest(int fd) {
     spiTransferStruct[0].len = 1;
     transfer(fd, gpioIds::PLPCDU_ADC_CS);
     uint8_t n = 11;
-    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), n, spiTransferStruct[0].len);
+    size_t tmpLen = spiTransferStruct[0].len;
+    max1227::prepareExternallyClockedRead0ToN(sendBuffer.data(), n, tmpLen);
     max1227::prepareExternallyClockedTemperatureRead(sendBuffer.data() + spiTransferStruct[0].len,
-                                                     spiTransferStruct[0].len);
+                                                     tmpLen);
+    spiTransferStruct[0].len = tmpLen;
     transfer(fd, gpioIds::PLPCDU_ADC_CS);
     uint16_t adcRaw[n + 1] = {};
     for (uint8_t idx = 0; idx < n + 1; idx++) {
diff --git a/linux/boardtest/UartTestClass.cpp b/linux/boardtest/UartTestClass.cpp
index 51ea237f..1f707c8f 100644
--- a/linux/boardtest/UartTestClass.cpp
+++ b/linux/boardtest/UartTestClass.cpp
@@ -13,6 +13,7 @@
 #include <string>
 
 #include "OBSWConfig.h"
+#include "eive/objects.h"
 #include "fsfw/globalfunctions/CRC.h"
 #include "fsfw/globalfunctions/DleEncoder.h"
 #include "fsfw/globalfunctions/arrayprinter.h"
@@ -164,7 +165,7 @@ void UartTestClass::scexInit() {
 #else
     std::string devname = "/dev/ul-scex";
 #endif
-    uartCookie = new SerialCookie(this->getObjectId(), devname, UartBaudRate::RATE_57600, 4096);
+    uartCookie = new UartCookie(this->getObjectId(), devname, UartBaudRate::RATE_57600, 4096);
     reader->setDebugMode(false);
     ReturnValue_t result = reader->initializeInterface(uartCookie);
     if (result != OK) {