diff --git a/hal/src/fsfw_hal/linux/uart/UartComIF.cpp b/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
index 3c975735..f52b6b1e 100644
--- a/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
+++ b/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
@@ -453,9 +453,12 @@ ReturnValue_t UartComIF::flushUartRxBuffer(CookieIF *cookie) {
     }
     deviceFile = uartCookie->getDeviceFile();
     uartDeviceMapIter = uartDeviceMap.find(deviceFile);
-    int fd = uartDeviceMapIter->second.fileDescriptor;
-    tcflush(fd, TCIFLUSH);
-    return RETURN_OK;
+    if(uartDeviceMapIter != uartDeviceMap.end()) {
+        int fd = uartDeviceMapIter->second.fileDescriptor;
+        tcflush(fd, TCIFLUSH);
+        return RETURN_OK;
+    }
+    return RETURN_FAILED;
 }
 
 ReturnValue_t UartComIF::flushUartTxBuffer(CookieIF *cookie) {
@@ -468,9 +471,12 @@ ReturnValue_t UartComIF::flushUartTxBuffer(CookieIF *cookie) {
     }
     deviceFile = uartCookie->getDeviceFile();
     uartDeviceMapIter = uartDeviceMap.find(deviceFile);
-    int fd = uartDeviceMapIter->second.fileDescriptor;
-    tcflush(fd, TCOFLUSH);
-    return RETURN_OK;
+    if(uartDeviceMapIter != uartDeviceMap.end()) {
+        int fd = uartDeviceMapIter->second.fileDescriptor;
+        tcflush(fd, TCOFLUSH);
+        return RETURN_OK;
+    }
+    return RETURN_FAILED;
 }
 
 ReturnValue_t UartComIF::flushUartTxAndRxBuf(CookieIF *cookie) {
@@ -483,9 +489,12 @@ ReturnValue_t UartComIF::flushUartTxAndRxBuf(CookieIF *cookie) {
     }
     deviceFile = uartCookie->getDeviceFile();
     uartDeviceMapIter = uartDeviceMap.find(deviceFile);
-    int fd = uartDeviceMapIter->second.fileDescriptor;
-    tcflush(fd, TCIOFLUSH);
-    return RETURN_OK;
+    if(uartDeviceMapIter != uartDeviceMap.end()) {
+        int fd = uartDeviceMapIter->second.fileDescriptor;
+        tcflush(fd, TCIOFLUSH);
+        return RETURN_OK;
+    }
+    return RETURN_FAILED;
 }
 
 void UartComIF::setUartMode(struct termios *options, UartCookie &uartCookie) {
diff --git a/src/fsfw/osal/common/TcpTmTcBridge.cpp b/src/fsfw/osal/common/TcpTmTcBridge.cpp
index ad5b2ea1..f873d5c7 100644
--- a/src/fsfw/osal/common/TcpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/TcpTmTcBridge.cpp
@@ -17,7 +17,7 @@
 
 #endif
 
-const std::string TcpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_TCP_SERVER_PORT;
+const std::string TcpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
 
 TcpTmTcBridge::TcpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
         object_id_t tmStoreId, object_id_t tcStoreId):
diff --git a/src/fsfw/osal/common/TcpTmTcBridge.h b/src/fsfw/osal/common/TcpTmTcBridge.h
index b965c880..be0d0d52 100644
--- a/src/fsfw/osal/common/TcpTmTcBridge.h
+++ b/src/fsfw/osal/common/TcpTmTcBridge.h
@@ -29,7 +29,7 @@ class TcpTmTcBridge:
         public TmTcBridge {
     friend class TcpTmTcServer;
 public:
-    // The ports chosen here should not be used by any other process
+    /* The ports chosen here should not be used by any other process. */
     static const std::string DEFAULT_SERVER_PORT;
 
     /**
diff --git a/src/fsfw/osal/common/TcpTmTcServer.cpp b/src/fsfw/osal/common/TcpTmTcServer.cpp
index f94449bb..057cd538 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.cpp
+++ b/src/fsfw/osal/common/TcpTmTcServer.cpp
@@ -22,14 +22,14 @@
 #define FSFW_TCP_RECV_WIRETAPPING_ENABLED 0
 #endif
 
-const std::string TcpTmTcServer::DEFAULT_TCP_SERVER_PORT =  "7303";
+const std::string TcpTmTcServer::DEFAULT_SERVER_PORT =  TcpTmTcBridge::DEFAULT_SERVER_PORT;
 
 TcpTmTcServer::TcpTmTcServer(object_id_t objectId, object_id_t tmtcTcpBridge,
         size_t receptionBufferSize, std::string customTcpServerPort):
         SystemObject(objectId), tmtcBridgeId(tmtcTcpBridge),
         tcpPort(customTcpServerPort), receptionBuffer(receptionBufferSize) {
     if(tcpPort == "") {
-        tcpPort = DEFAULT_TCP_SERVER_PORT;
+        tcpPort = DEFAULT_SERVER_PORT;
     }
 }
 
diff --git a/src/fsfw/osal/common/TcpTmTcServer.h b/src/fsfw/osal/common/TcpTmTcServer.h
index f7c36d69..6588f111 100644
--- a/src/fsfw/osal/common/TcpTmTcServer.h
+++ b/src/fsfw/osal/common/TcpTmTcServer.h
@@ -41,8 +41,7 @@ class TcpTmTcServer:
         public TcpIpBase,
         public ExecutableObjectIF {
 public:
-    /* The ports chosen here should not be used by any other process. */
-    static const std::string DEFAULT_TCP_SERVER_PORT;
+    static const std::string DEFAULT_SERVER_PORT;
 
     static constexpr  size_t ETHERNET_MTU_SIZE = 1500;
 
diff --git a/src/fsfw/osal/common/UdpTmTcBridge.cpp b/src/fsfw/osal/common/UdpTmTcBridge.cpp
index 06caadc1..db2546cd 100644
--- a/src/fsfw/osal/common/UdpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/UdpTmTcBridge.cpp
@@ -17,7 +17,7 @@
 #define FSFW_UDP_SEND_WIRETAPPING_ENABLED    0
 #endif
 
-const std::string UdpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_UDP_SERVER_PORT;
+const std::string UdpTmTcBridge::DEFAULT_SERVER_PORT =  tcpip::DEFAULT_SERVER_PORT;
 
 UdpTmTcBridge::UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
         std::string udpServerPort, object_id_t tmStoreId, object_id_t tcStoreId):
diff --git a/src/fsfw/osal/common/tcpipCommon.h b/src/fsfw/osal/common/tcpipCommon.h
index 4b67ab24..ce7a90cd 100644
--- a/src/fsfw/osal/common/tcpipCommon.h
+++ b/src/fsfw/osal/common/tcpipCommon.h
@@ -13,8 +13,7 @@
 
 namespace tcpip {
 
-const char* const DEFAULT_UDP_SERVER_PORT = "7301";
-const char* const DEFAULT_TCP_SERVER_PORT = "7303";
+const char* const DEFAULT_SERVER_PORT = "7301";
 
 enum class Protocol {
     UDP,
diff --git a/src/fsfw/osal/linux/CommandExecutor.cpp b/src/fsfw/osal/linux/CommandExecutor.cpp
index cd05a553..5d131472 100644
--- a/src/fsfw/osal/linux/CommandExecutor.cpp
+++ b/src/fsfw/osal/linux/CommandExecutor.cpp
@@ -46,6 +46,7 @@ ReturnValue_t CommandExecutor::execute() {
         currentFd = fileno(currentCmdFile);
         waiter.fd = currentFd;
     }
+    state = States::PENDING;
     return HasReturnvaluesIF::RETURN_OK;
 }
 
diff --git a/src/fsfw/osal/linux/Timer.cpp b/src/fsfw/osal/linux/Timer.cpp
index dca3112d..899ca4a5 100644
--- a/src/fsfw/osal/linux/Timer.cpp
+++ b/src/fsfw/osal/linux/Timer.cpp
@@ -27,6 +27,7 @@ int Timer::setTimer(uint32_t intervalMs) {
 	timer.it_value.tv_nsec = (intervalMs * 1000000) % (1000000000);
 	timer.it_interval.tv_sec = 0;
 	timer.it_interval.tv_nsec = 0;
+	set = true;
 	return timer_settime(timerId, 0, &timer, NULL);
 }
 
@@ -43,3 +44,14 @@ int Timer::getTimer(uint32_t* remainingTimeMs){
 
 	return status;
 }
+
+bool Timer::isSet() const {
+    return this->set;
+}
+
+void Timer::resetTimer() {
+    if(not this->set) {
+        set = false;
+    }
+    setTimer(0);
+}
diff --git a/src/fsfw/osal/linux/Timer.h b/src/fsfw/osal/linux/Timer.h
index f94bca59..6d8c1b9e 100644
--- a/src/fsfw/osal/linux/Timer.h
+++ b/src/fsfw/osal/linux/Timer.h
@@ -38,7 +38,11 @@ public:
 	 */
 	int getTimer(uint32_t* remainingTimeMs);
 
+	bool isSet() const;
+	void resetTimer();
+
 private:
+	bool set = true;
 	timer_t timerId;
 };
 
diff --git a/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp b/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp
index 422b47fc..e42e515d 100644
--- a/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp
+++ b/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp
@@ -56,21 +56,21 @@ void fsfwPrint(sif::PrintLevel printType, const char* fmt, va_list arg) {
 #endif
 
    if (printType == sif::PrintLevel::INFO_LEVEL) {
-       len += sprintf(bufferPosition + len, "INFO: ");
+       len += sprintf(bufferPosition + len, "INFO");
    }
    if(printType == sif::PrintLevel::DEBUG_LEVEL) {
-	   len += sprintf(bufferPosition + len, "DEBUG: ");
+	   len += sprintf(bufferPosition + len, "DEBUG");
    }
    if(printType == sif::PrintLevel::WARNING_LEVEL) {
-	   len += sprintf(bufferPosition + len, "WARNING: ");
+	   len += sprintf(bufferPosition + len, "WARNING");
    }
 
    if(printType == sif::PrintLevel::ERROR_LEVEL) {
-	   len += sprintf(bufferPosition + len, "ERROR: ");
+	   len += sprintf(bufferPosition + len, "ERROR");
    }
 
 #if FSFW_COLORED_OUTPUT == 1
-   len += sprintf(bufferPosition, sif::ANSI_COLOR_RESET);
+   len += sprintf(bufferPosition + len, sif::ANSI_COLOR_RESET);
 #endif
 
     Clock::TimeOfDay_t now;
@@ -78,7 +78,7 @@ void fsfwPrint(sif::PrintLevel printType, const char* fmt, va_list arg) {
     /*
      * Log current time to terminal if desired.
      */
-    len += sprintf(bufferPosition + len, "| %lu:%02lu:%02lu.%03lu | ",
+    len += sprintf(bufferPosition + len, " | %lu:%02lu:%02lu.%03lu | ",
     		(unsigned long) now.hour,
 			(unsigned long) now.minute,
 			(unsigned long) now.second,