diff --git a/hal/src/fsfw_hal/linux/uart/UartComIF.cpp b/hal/src/fsfw_hal/linux/uart/UartComIF.cpp
index 3c9757356..f52b6b1e4 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 ad5b2ea12..24f1a2813 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_UDP_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 b965c880f..6cfacb9fa 100644
--- a/src/fsfw/osal/common/TcpTmTcBridge.h
+++ b/src/fsfw/osal/common/TcpTmTcBridge.h
@@ -29,8 +29,8 @@ class TcpTmTcBridge:
         public TmTcBridge {
     friend class TcpTmTcServer;
 public:
-    // The ports chosen here should not be used by any other process
-    static const std::string DEFAULT_SERVER_PORT;
+    /* The ports chosen here should not be used by any other process. */
+    static const std::string DEFAULT_UDP_SERVER_PORT;
 
     /**
      * Constructor
diff --git a/src/fsfw/osal/common/UdpTmTcBridge.cpp b/src/fsfw/osal/common/UdpTmTcBridge.cpp
index 06caadc1d..7015cf4a5 100644
--- a/src/fsfw/osal/common/UdpTmTcBridge.cpp
+++ b/src/fsfw/osal/common/UdpTmTcBridge.cpp
@@ -17,13 +17,13 @@
 #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_UDP_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):
         TmTcBridge(objectId, tcDestination, tmStoreId, tcStoreId) {
     if(udpServerPort == "") {
-        this->udpServerPort = DEFAULT_SERVER_PORT;
+        this->udpServerPort = DEFAULT_UDP_SERVER_PORT;
     }
     else {
         this->udpServerPort = udpServerPort;
diff --git a/src/fsfw/osal/common/UdpTmTcBridge.h b/src/fsfw/osal/common/UdpTmTcBridge.h
index 93c7511e1..7a346de57 100644
--- a/src/fsfw/osal/common/UdpTmTcBridge.h
+++ b/src/fsfw/osal/common/UdpTmTcBridge.h
@@ -28,7 +28,7 @@ class UdpTmTcBridge:
     friend class UdpTcPollingTask;
 public:
     /* The ports chosen here should not be used by any other process. */
-    static const std::string DEFAULT_SERVER_PORT;
+    static const std::string DEFAULT_UDP_SERVER_PORT;
 
     UdpTmTcBridge(object_id_t objectId, object_id_t tcDestination,
             std::string udpServerPort = "", object_id_t tmStoreId = objects::TM_STORE,
diff --git a/src/fsfw/osal/common/tcpipCommon.h b/src/fsfw/osal/common/tcpipCommon.h
index 4b67ab24c..ce7a90cd1 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/serviceinterface/ServiceInterfacePrinter.cpp b/src/fsfw/serviceinterface/ServiceInterfacePrinter.cpp
index 422b47fcd..e42e515d7 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,