diff --git a/Sandboxie/common/my_version.h b/Sandboxie/common/my_version.h
index e73bff08..2117a7f0 100644
--- a/Sandboxie/common/my_version.h
+++ b/Sandboxie/common/my_version.h
@@ -21,8 +21,8 @@
 #ifndef _MY_VERSION_H
 #define _MY_VERSION_H
 
-#define MY_VERSION_BINARY       5,50,5
-#define MY_VERSION_STRING       "5.50.5"
+#define MY_VERSION_BINARY       5,50,6
+#define MY_VERSION_STRING       "5.50.6"
 #define MY_VERSION_COMPAT		"5.50.0" // this refers to the driver ABI compatibility
 
 // These #defines are used by either Resource Compiler, or by NSIC installer
diff --git a/Sandboxie/core/drv/process_api.c b/Sandboxie/core/drv/process_api.c
index c64872d0..152fe3e1 100644
--- a/Sandboxie/core/drv/process_api.c
+++ b/Sandboxie/core/drv/process_api.c
@@ -871,7 +871,9 @@ _FX NTSTATUS Process_Enumerate(
 #endif
         }
 
-done:
+#ifdef USE_PROCESS_MAP
+        done:
+#endif
         *count = num;
 
         status = STATUS_SUCCESS;
diff --git a/Sandboxie/core/drv/syscall.c b/Sandboxie/core/drv/syscall.c
index 6f352c3e..52814a5c 100644
--- a/Sandboxie/core/drv/syscall.c
+++ b/Sandboxie/core/drv/syscall.c
@@ -903,7 +903,7 @@ _FX NTSTATUS Syscall_Api_Invoke(PROCESS *proc, ULONG64 *parms)
         DbgPrint("[syscall] request p=%06d t=%06d - END   (%0X)  %s\n", PsGetCurrentProcessId(), PsGetCurrentThreadId(), status, entry->name);
     }*/
 
-    if (proc->terminated || (proc && Conf_Get_Boolean(proc->box->name, L"screwUp", 0, FALSE))) {
+    if (proc->terminated) {
 
         Process_TerminateProcess(proc);
         return STATUS_PROCESS_IS_TERMINATING;
diff --git a/Sandboxie/core/svc/PipeServer.cpp b/Sandboxie/core/svc/PipeServer.cpp
index 16782708..271646e5 100644
--- a/Sandboxie/core/svc/PipeServer.cpp
+++ b/Sandboxie/core/svc/PipeServer.cpp
@@ -819,6 +819,7 @@ void PipeServer::PortFindClientUnsafe(const CLIENT_ID& ClientId, CLIENT_PROCESS
     clientThread = clientProcess ? (CLIENT_THREAD *)map_get(&clientProcess->thread_map, ClientId.UniqueThread) : NULL;
 #else
     clientProcess = (CLIENT_PROCESS *)List_Head(&m_clients);
+    clientThread = NULL;
 
     while (clientProcess) {
 
diff --git a/SandboxiePlus/version.h b/SandboxiePlus/version.h
index 3b60cdc1..d13e4a11 100644
--- a/SandboxiePlus/version.h
+++ b/SandboxiePlus/version.h
@@ -3,7 +3,7 @@
 #define VERSION_MJR		0
 #define VERSION_MIN 	8
 #define VERSION_REV 	5
-#define VERSION_UPD 	0
+#define VERSION_UPD 	1
 
 #ifndef STR
 #define STR2(X) #X