diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2572b20..cccd51a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,9 +345,15 @@ if(FSFW_BUILD_TESTS)
           DEPENDENCIES ${FSFW_TEST_TGT})
       else()
         setup_target_for_coverage_lcov(
-          NAME ${FSFW_TEST_TGT}_coverage EXECUTABLE ${FSFW_TEST_TGT}
-          DEPENDENCIES ${FSFW_TEST_TGT}
-          GENHTML_ARGS --html-epilog ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
+          NAME
+          ${FSFW_TEST_TGT}_coverage
+          EXECUTABLE
+          ${FSFW_TEST_TGT}
+          DEPENDENCIES
+          ${FSFW_TEST_TGT}
+          GENHTML_ARGS
+          --html-epilog
+          ${CMAKE_SOURCE_DIR}/unittests/lcov_epilog.html)
       endif()
     endif()
   endif()
diff --git a/src/fsfw/datalinklayer/MapPacketExtraction.cpp b/src/fsfw/datalinklayer/MapPacketExtraction.cpp
index c074de73..839209ac 100644
--- a/src/fsfw/datalinklayer/MapPacketExtraction.cpp
+++ b/src/fsfw/datalinklayer/MapPacketExtraction.cpp
@@ -88,7 +88,7 @@ ReturnValue_t MapPacketExtraction::unpackBlockingPackets(TcTransferFrame* frame)
   uint32_t totalLength = frame->getDataLength();
   if (totalLength > MAX_PACKET_SIZE) return CONTENT_TOO_LARGE;
   uint8_t* position = frame->getDataField();
-  while ((totalLength > SpacePacketBase::MINIMUM_SIZE)) {
+  while ((totalLength > ccsds::HEADER_LEN)) {
     SpacePacketBase packet(position);
     uint32_t packetSize = packet.getFullSize();
     if (packetSize <= totalLength) {
diff --git a/src/fsfw/osal/freertos/FixedTimeslotTask.cpp b/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
index a0a4ecee..41710e0d 100644
--- a/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
+++ b/src/fsfw/osal/freertos/FixedTimeslotTask.cpp
@@ -56,7 +56,9 @@ ReturnValue_t FixedTimeslotTask::startTask() {
   // start time for the first entry.
   auto slotListIter = pollingSeqTable.current;
 
-  pollingSeqTable.intializeSequenceAfterTaskCreation();
+  ReturnValue_t result = pollingSeqTable.intializeSequenceAfterTaskCreation();
+  // TODO: Proper error handling
+  static_cast<void>(result);
 
   // The start time for the first entry is read.
   uint32_t intervalMs = slotListIter->pollingTimeMs;
diff --git a/src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp
index 23892dcc..0e73be83 100644
--- a/src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp
+++ b/src/fsfw/serviceinterface/ServiceInterfaceBuffer.cpp
@@ -3,7 +3,6 @@
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 
 #include <cinttypes>
-
 #include <cstring>
 
 #include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
diff --git a/src/fsfw/timemanager/TimeReaderIF.h b/src/fsfw/timemanager/TimeReaderIF.h
index 8fd7415f..be03fb2a 100644
--- a/src/fsfw/timemanager/TimeReaderIF.h
+++ b/src/fsfw/timemanager/TimeReaderIF.h
@@ -1,6 +1,7 @@
 #ifndef FSFW_TIMEMANAGER_TIMEREADERIF_H
 #define FSFW_TIMEMANAGER_TIMEREADERIF_H
 
+#include <cstdio>
 #include <cstdlib>
 
 #include "TimeStampIF.h"
diff --git a/src/fsfw_hal/common/CMakeLists.txt b/src/fsfw_hal/common/CMakeLists.txt
index 1cd9c678..2f4608f8 100644
--- a/src/fsfw_hal/common/CMakeLists.txt
+++ b/src/fsfw_hal/common/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(gpio)
 
-target_sources(${LIB_FSFW_NAME} PRIVATE printChar.c)
\ No newline at end of file
+target_sources(${LIB_FSFW_NAME} PRIVATE printChar.c)
diff --git a/src/fsfw_hal/common/printChar.c b/src/fsfw_hal/common/printChar.c
index 6e02c1df..24fba5c8 100644
--- a/src/fsfw_hal/common/printChar.c
+++ b/src/fsfw_hal/common/printChar.c
@@ -1,5 +1,5 @@
-#include <stdio.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 void __attribute__((weak)) printChar(const char* character, bool errStream) {
   if (errStream) {