diff --git a/src/modules/udp_transport/source/udp_socket2_manager_windows.cc b/src/modules/udp_transport/source/udp_socket2_manager_windows.cc
index 979c783b2..6280e6dda 100644
--- a/src/modules/udp_transport/source/udp_socket2_manager_windows.cc
+++ b/src/modules/udp_transport/source/udp_socket2_manager_windows.cc
@@ -25,9 +25,10 @@ UdpSocket2ManagerWindows::UdpSocket2ManagerWindows()
       _id(-1),
       _stopped(false),
       _init(false),
-      _pCrit(NULL),
+      _pCrit(CriticalSectionWrapper::CreateCriticalSection()),
       _ioCompletionHandle(NULL),
-      _numActiveSockets(0)
+      _numActiveSockets(0),
+      _event(EventWrapper::Create())
 {
     _managerNumber = _numOfActiveManagers++;
 
@@ -40,7 +41,6 @@ UdpSocket2ManagerWindows::UdpSocket2ManagerWindows()
         //                 if a UdpSocket2ManagerWindows() created and destroyed
         //                 without being initialized.
     }
-    _event = EventWrapper::Create();
 }
 
 UdpSocket2ManagerWindows::~UdpSocket2ManagerWindows()
@@ -87,10 +87,10 @@ UdpSocket2ManagerWindows::~UdpSocket2ManagerWindows()
                 WSACleanup();
             }
         }
-        if(_pCrit)
-        {
-            delete _pCrit;
-        }
+    }
+    if(_pCrit)
+    {
+        delete _pCrit;
     }
     if(_event)
     {
@@ -164,11 +164,6 @@ bool UdpSocket2ManagerWindows::StartWorkerThreads()
 {
     if(!_init)
     {
-        _pCrit = CriticalSectionWrapper::CreateCriticalSection();
-        if(_pCrit == NULL)
-        {
-            return false;
-        }
         _pCrit->Enter();
 
         _ioCompletionHandle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL,
diff --git a/src/modules/udp_transport/source/udp_socket2_manager_windows.h b/src/modules/udp_transport/source/udp_socket2_manager_windows.h
index f8619d6bc..5adb29365 100644
--- a/src/modules/udp_transport/source/udp_socket2_manager_windows.h
+++ b/src/modules/udp_transport/source/udp_socket2_manager_windows.h
@@ -131,7 +131,6 @@ private:
     bool _init;
     WebRtc_Word32 _numActiveSockets;
     ListWrapper _workerThreadsList;
-    WebRtc_UWord32 _numOfWorkThreads;
     EventWrapper* _event;
 
     HANDLE _ioCompletionHandle;
diff --git a/src/system_wrappers/interface/static_instance.h b/src/system_wrappers/interface/static_instance.h
index cd19eea5e..5ad81c501 100644
--- a/src/system_wrappers/interface/static_instance.h
+++ b/src/system_wrappers/interface/static_instance.h
@@ -138,7 +138,6 @@ static T* GetStaticInstance(CountOperation count_operation) {
         delete static_cast<T*>(new_instance);
       }
     }
-    return NULL;
   } else if (state == kDestroy) {
     T* old_value = static_cast<T*> (InterlockedExchangePointer(
         reinterpret_cast<void* volatile*>(&instance), NULL));
diff --git a/src/system_wrappers/source/system_wrappers.gyp b/src/system_wrappers/source/system_wrappers.gyp
index c4785ff75..3167cb90a 100644
--- a/src/system_wrappers/source/system_wrappers.gyp
+++ b/src/system_wrappers/source/system_wrappers.gyp
@@ -46,6 +46,7 @@
         '../interface/scoped_ptr.h',
         '../interface/scoped_refptr.h',
         '../interface/sort.h',
+        '../interface/static_instance.h',
         '../interface/thread_wrapper.h',
         '../interface/tick_util.h',
         '../interface/trace.h',