diff --git a/User.cpp b/User.cpp
index 0a6d5d4d..7cbda499 100644
--- a/User.cpp
+++ b/User.cpp
@@ -262,7 +262,7 @@ void CUser::UserConnected(CClient* pClient) {
 	if (GetIRCSock() != NULL) {
 		CString sUserMode("");
 		const set<unsigned char>& scUserModes = GetIRCSock()->GetUserModes();
-		for (set<unsigned char>::iterator it = scUserModes.begin();
+		for (set<unsigned char>::const_iterator it = scUserModes.begin();
 				it != scUserModes.end(); it++) {
 			sUserMode += *it;
 		}
@@ -482,7 +482,7 @@ bool CUser::IsHostAllowed(const CString& sHostMask) const {
 		return true;
 	}
 
-	for (set<CString>::iterator a = m_ssAllowedHosts.begin(); a != m_ssAllowedHosts.end(); a++) {
+	for (set<CString>::const_iterator a = m_ssAllowedHosts.begin(); a != m_ssAllowedHosts.end(); a++) {
 		if (sHostMask.WildCmp(*a)) {
 			return true;
 		}
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index c90cc80e..eb914d49 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -596,7 +596,7 @@ public:
 	void SendNickList(CUser* pUser, const set<CString>& ssNicks, const CString& sChan) {
 		CString sNickList;
 
-		for (set<CString>::iterator it = ssNicks.begin(); it != ssNicks.end(); it++) {
+		for (set<CString>::const_iterator it = ssNicks.begin(); it != ssNicks.end(); it++) {
 			CUser* pChanUser = CZNC::Get().FindUser(*it);
 
 			if (pChanUser && pChanUser->IsUserAttached()) {