diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp
index 5c716b46..b67f64bf 100644
--- a/src/lib/client/Client.cpp
+++ b/src/lib/client/Client.cpp
@@ -55,7 +55,7 @@ Client::Client(
 		const String& name, const NetworkAddress& address,
 		ISocketFactory* socketFactory,
 		synergy::Screen* screen,
-		ClientArgs& args) :
+		ClientArgs const& args) :
 	m_mock(false),
 	m_name(name),
 	m_serverAddress(address),
diff --git a/src/lib/client/Client.h b/src/lib/client/Client.h
index 20e44a6a..b3668783 100644
--- a/src/lib/client/Client.h
+++ b/src/lib/client/Client.h
@@ -222,5 +222,5 @@ private:
 	Thread*				m_writeToDropDirThread;
 	TCPSocket*			m_socket;
 	bool				m_useSecureNetwork;
-	ClientArgs&			m_args;
+	ClientArgs			m_args;
 };
diff --git a/src/lib/server/ClientListener.cpp b/src/lib/server/ClientListener.cpp
index a0ae3028..858fae15 100644
--- a/src/lib/server/ClientListener.cpp
+++ b/src/lib/server/ClientListener.cpp
@@ -150,7 +150,7 @@ ClientListener::handleClientConnecting(const Event&, void*)
 	
 	// When using non SSL, server accepts clients immediately, while SSL
 	// has to call secure accept which may require retry
-	if (!m_args.m_enableCrypto) {
+	if (!m_useSecureNetwork) {
 		m_events->addEvent(Event(m_events->forClientListener().accepted(),
 								stream->getEventTarget()));
 	}