diff --git a/Client.h b/Client.h
index ae46c271..77b9cf15 100644
--- a/Client.h
+++ b/Client.h
@@ -60,16 +60,16 @@ protected:
 class CClient : public Csock {
 public:
 	CClient() : Csock() {
-		Init();
+		InitClient();
 	}
 
 	CClient(const CString& sHostname, unsigned short uPort, int iTimeout = 60) : Csock(sHostname, uPort, iTimeout) {
-		Init();
+		InitClient();
 	}
 
 	virtual ~CClient();
 
-	void Init() {
+	void InitClient() {
 		m_pUser = NULL;
 		m_pIRCSock = NULL;
 		m_bAuthed = false;
diff --git a/Modules.h b/Modules.h
index a8b541fc..48f26058 100644
--- a/Modules.h
+++ b/Modules.h
@@ -122,6 +122,9 @@ public:
 	CSocket(CModule* pModule, const CString& sLabel, const CString& sHostname, unsigned short uPort, int iTimeout = 60);
 	virtual ~CSocket();
 
+	using Csock::Connect;
+	using Csock::Listen;
+
 	bool Connect(const CString& sHostname, unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 60);
 	bool Listen(unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 0);
 	virtual bool PutIRC(const CString& sLine);
diff --git a/modules/away.cpp b/modules/away.cpp
index 21aefe37..feac2b3d 100644
--- a/modules/away.cpp
+++ b/modules/away.cpp
@@ -427,7 +427,7 @@ public:
 		return( CONTINUE );	
 	}
 	
-	virtual EModRet OnUserNotice(const CString& sTarget, CString& sMessage)
+	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage)
 	{
 		Ping();
 		if( m_bIsAway )
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index ea37354f..e4248724 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -365,7 +365,7 @@ public:
 	{
 		return CBDouble( "OnCTCPReply", NICK( Nick ), sMessage ); 
 	}
-	virtual EModRet OnUserCTCP(const CString& sTarget, CString& sMessage)
+	virtual EModRet OnUserCTCP(CString& sTarget, CString& sMessage)
 	{
 		return CBDouble( "OnUserCTCP", sTarget, sMessage ); 
 	}
@@ -390,7 +390,7 @@ public:
 	{
 		return( CBTriple( "OnChanMsg", NICK( Nick ), CHAN( Channel ), sMessage ) );
 	}
-	virtual EModRet OnUserNotice(const CString& sTarget, CString& sMessage)
+	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage)
 	{
 		return CBDouble( "OnUserNotice", sTarget, sMessage );
 	}
diff --git a/modules/sample.cpp b/modules/sample.cpp
index 486b73d3..8056a3e3 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -141,7 +141,7 @@ public:
 		return CONTINUE;
 	}
 
-	virtual EModRet OnUserNotice(const CString& sTarget, CString& sMessage) {
+	virtual EModRet OnUserNotice(CString& sTarget, CString& sMessage) {
 		PutModule("[" + sTarget + "] usernotice [" + sMessage + "]");
 		sMessage = "\037" + sMessage + "\037";