diff --git a/src/fsfw/osal/freertos/TaskManagement.cpp b/src/fsfw/osal/freertos/TaskManagement.cpp
index 1879976cd..8380e2eb8 100644
--- a/src/fsfw/osal/freertos/TaskManagement.cpp
+++ b/src/fsfw/osal/freertos/TaskManagement.cpp
@@ -5,7 +5,9 @@ void TaskManagement::vRequestContextSwitchFromTask() { vTaskDelay(0); }
 void TaskManagement::requestContextSwitch(CallContext callContext = CallContext::TASK) {
   if (callContext == CallContext::ISR) {
     // This function depends on the partmacro.h definition for the specific device
-    vRequestContextSwitchFromISR();
+    //vRequestContextSwitchFromISR();
+    //TODO is this all still needed in current freeRTOS?
+    vRequestContextSwitchFromTask();
   } else {
     vRequestContextSwitchFromTask();
   }
diff --git a/src/fsfw/timemanager/TimeReaderIF.h b/src/fsfw/timemanager/TimeReaderIF.h
index aa64b7548..881402443 100644
--- a/src/fsfw/timemanager/TimeReaderIF.h
+++ b/src/fsfw/timemanager/TimeReaderIF.h
@@ -9,6 +9,8 @@
 #ifdef PLATFORM_WIN
 // wtf? Required for timeval!
 #include <winsock.h>
+#else
+#include <sys/time.h>
 #endif
 
 #include "TimeStampIF.h"
diff --git a/src/fsfw/tmtc/CMakeLists.txt b/src/fsfw/tmtc/CMakeLists.txt
index 84a2106e2..20c9c075a 100644
--- a/src/fsfw/tmtc/CMakeLists.txt
+++ b/src/fsfw/tmtc/CMakeLists.txt
@@ -3,4 +3,5 @@ target_sources(
   FsfwProtocolHeader.cpp
   TmManager.cpp
   TmMessage.cpp
-  UdpTmTcBridge.cpp)
\ No newline at end of file
+  #UdpTmTcBridge.cpp
+  )
\ No newline at end of file