diff --git a/analyzer/windows/lib/common/defines.py b/analyzer/windows/lib/common/defines.py
index 3422c608dcf..fab8c1b5116 100644
--- a/analyzer/windows/lib/common/defines.py
+++ b/analyzer/windows/lib/common/defines.py
@@ -202,7 +202,7 @@ class PROCESSENTRY32(Structure):
         ("dwSize", DWORD),
         ("cntUsage", DWORD),
         ("th32ProcessID", DWORD),
-        ("th32DefaultHeapID", DWORD),
+        ("th32DefaultHeapID", ULONG_PTR),
         ("th32ModuleID", DWORD),
         ("cntThreads", DWORD),
         ("th32ParentProcessID", DWORD),
@@ -265,7 +265,7 @@ class SYSTEM_INFO(Structure):
         ("dwPageSize", DWORD),
         ("lpMinimumApplicationAddress", LPVOID),
         ("lpMaximumApplicationAddress", LPVOID),
-        ("dwActiveProcessorMask", DWORD),
+        ("dwActiveProcessorMask", ULONG_PTR),
         ("dwNumberOfProcessors", DWORD),
         ("dwProcessorType", DWORD),
         ("dwAllocationGranularity", DWORD),
diff --git a/analyzer/windows/lib/core/pipe.py b/analyzer/windows/lib/core/pipe.py
index 5193b486190..d56d5350924 100644
--- a/analyzer/windows/lib/core/pipe.py
+++ b/analyzer/windows/lib/core/pipe.py
@@ -77,12 +77,12 @@ def run(self):
         if pid.value:
             sock = self.sockets.get(pid.value)
             if not sock:
-                sock = socket.create_connection(self.destination)
+                sock = socket.create_connection(self.destination, timeout=60)
                 self.sockets[pid.value] = sock
 
             self.active[pid.value] = True
         else:
-            sock = socket.create_connection(self.destination)
+            sock = socket.create_connection(self.destination, timeout=60)
 
         open_handles.add(sock)