diff --git a/osal/common/TcpIpBase.cpp b/osal/common/TcpIpBase.cpp
index 35524743..279fd1c4 100644
--- a/osal/common/TcpIpBase.cpp
+++ b/osal/common/TcpIpBase.cpp
@@ -8,32 +8,16 @@
 #endif
 
 TcpIpBase::TcpIpBase() {
-    closeSocket(serverSocket);
+
 }
 
 TcpIpBase::~TcpIpBase() {
+    closeSocket(serverSocket);
 #ifdef _WIN32
     WSACleanup();
 #endif
 }
 
-
-int TcpIpBase::closeSocket(socket_t socket) {
-#ifdef _WIN32
-    return closesocket(socket);
-#elif defined(__unix__)
-    return close(socket);
-#endif
-}
-
-int TcpIpBase::getLastSocketError() {
-#ifdef _WIN32
-    return WSAGetLastError();
-#elif defined(__unix__)
-    return errno;
-#endif
-}
-
 ReturnValue_t TcpIpBase::initialize() {
 #ifdef _WIN32
     /* Initiates Winsock DLL. */
@@ -51,3 +35,20 @@ ReturnValue_t TcpIpBase::initialize() {
 #endif
     return HasReturnvaluesIF::RETURN_OK;
 }
+
+int TcpIpBase::closeSocket(socket_t socket) {
+#ifdef _WIN32
+    return closesocket(socket);
+#elif defined(__unix__)
+    return close(socket);
+#endif
+}
+
+int TcpIpBase::getLastSocketError() {
+#ifdef _WIN32
+    return WSAGetLastError();
+#elif defined(__unix__)
+    return errno;
+#endif
+}
+
diff --git a/osal/common/UdpTcPollingTask.cpp b/osal/common/UdpTcPollingTask.cpp
index bace593f..759cee05 100644
--- a/osal/common/UdpTcPollingTask.cpp
+++ b/osal/common/UdpTcPollingTask.cpp
@@ -154,7 +154,7 @@ ReturnValue_t UdpTcPollingTask::initializeAfterTaskCreation() {
 void UdpTcPollingTask::setTimeout(double timeoutSeconds) {
 #ifdef _WIN32
     DWORD timeoutMs = timeoutSeconds * 1000.0;
-    int result = setsockopt(serverUdpSocket, SOL_SOCKET, SO_RCVTIMEO,
+    int result = setsockopt(serverSocket, SOL_SOCKET, SO_RCVTIMEO,
             reinterpret_cast<const char*>(&timeoutMs), sizeof(DWORD));
     if(result == -1) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
diff --git a/osal/common/UdpTmTcBridge.cpp b/osal/common/UdpTmTcBridge.cpp
index ae74e94b..7f3dc929 100644
--- a/osal/common/UdpTmTcBridge.cpp
+++ b/osal/common/UdpTmTcBridge.cpp
@@ -65,19 +65,11 @@ ReturnValue_t UdpTmTcBridge::initialize() {
 #endif
 
     struct addrinfo *addrResult = nullptr;
-    struct addrinfo hints = { 0 };
+    struct addrinfo hints = {};
 
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_DGRAM;
     hints.ai_protocol = IPPROTO_UDP;
-//#ifdef _WIN32
-//    /* See:
-//    https://docs.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-getaddrinfo
-//    and
-//
-//    for information about AI_PASSIVE. */
-//    hints.ai_flags = AI_PASSIVE;
-//#endif
 
     /* Set up UDP socket:
     https://en.wikipedia.org/wiki/Getaddrinfo
diff --git a/osal/common/UdpTmTcBridge.h b/osal/common/UdpTmTcBridge.h
index afc8ee98..6f38034e 100644
--- a/osal/common/UdpTmTcBridge.h
+++ b/osal/common/UdpTmTcBridge.h
@@ -4,8 +4,14 @@
 #include "TcpIpBase.h"
 #include "../../tmtcservices/TmTcBridge.h"
 
-#ifdef __unix__
+#ifdef _WIN32
+
+#include <ws2tcpip.h>
+
+#elif defined(__unix__)
+
 #include <sys/socket.h>
+
 #endif
 
 #include <string>