diff --git a/src/lib/ipc/CIpcClient.cpp b/src/lib/ipc/CIpcClient.cpp
index d731a0a0..836edc44 100644
--- a/src/lib/ipc/CIpcClient.cpp
+++ b/src/lib/ipc/CIpcClient.cpp
@@ -46,7 +46,6 @@ CIpcClient::init()
 
 CIpcClient::~CIpcClient()
 {
-	disconnect();
 }
 
 void
diff --git a/src/lib/ipc/CIpcClientProxy.cpp b/src/lib/ipc/CIpcClientProxy.cpp
index 344f22ac..73358b4c 100644
--- a/src/lib/ipc/CIpcClientProxy.cpp
+++ b/src/lib/ipc/CIpcClientProxy.cpp
@@ -184,6 +184,7 @@ CIpcClientProxy::disconnect()
 {
 	LOG((CLOG_DEBUG "ipc client proxy disconnect"));
 	m_disconnecting = true;
+	m_stream.close();
 	EVENTQUEUE->addEvent(CEvent(getDisconnectedEvent(), this));
 }
 
diff --git a/src/lib/ipc/CIpcServerProxy.cpp b/src/lib/ipc/CIpcServerProxy.cpp
index cde411e1..e7467a81 100644
--- a/src/lib/ipc/CIpcServerProxy.cpp
+++ b/src/lib/ipc/CIpcServerProxy.cpp
@@ -38,8 +38,6 @@ CIpcServerProxy::~CIpcServerProxy()
 {
 	EVENTQUEUE->removeHandler(m_stream.getInputReadyEvent(),
 		m_stream.getEventTarget());
-
-	m_stream.close();
 }
 
 void
diff --git a/src/lib/platform/CMSWindowsRelauncher.cpp b/src/lib/platform/CMSWindowsRelauncher.cpp
index 63c4e325..e027a95e 100644
--- a/src/lib/platform/CMSWindowsRelauncher.cpp
+++ b/src/lib/platform/CMSWindowsRelauncher.cpp
@@ -276,7 +276,7 @@ CMSWindowsRelauncher::mainLoop(void*)
 
 			if (launched) {
 				LOG((CLOG_DEBUG "closing existing process to make way for new one"));
-				shutdownProcess(pi.hProcess, pi.dwProcessId, 10);
+				shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
 				launched = false;
 			}
 
@@ -365,7 +365,7 @@ CMSWindowsRelauncher::mainLoop(void*)
 
 	if (launched) {
 		LOG((CLOG_DEBUG "terminated running process on exit"));
-		shutdownProcess(pi.hProcess, pi.dwProcessId, 10);
+		shutdownProcess(pi.hProcess, pi.dwProcessId, 20);
 	}
 	
 	LOG((CLOG_DEBUG "relauncher main thread finished"));
@@ -506,7 +506,7 @@ CMSWindowsRelauncher::shutdownExistingProcesses()
 				_stricmp(entry.szExeFile, "synergys.exe") == 0) {
 				
 				HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
-				shutdownProcess(handle, entry.th32ProcessID, 1);
+				shutdownProcess(handle, entry.th32ProcessID, 10);
 			}
 		}