diff --git a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp
index 1756235a..ecf507b6 100644
--- a/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp
+++ b/engine/server/application/CentralServer/src/shared/AuctionTransferGameAPI/ATGenericAPI/GenericApiCore.cpp
@@ -85,7 +85,7 @@ GenericAPICore::GenericAPICore(const char *game, const char *hosts[],
 GenericAPICore::~GenericAPICore()
 //----------------------------------------
 {
-    for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++)
+    for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter)
     {
         GenericConnection *con = *conIter;
         delete con;
@@ -198,7 +198,7 @@ void GenericAPICore::process()
 		}
 	}
 
-   for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++)
+   for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter)
     {
 		GenericConnection *con = *conIter;
 	    con->process();
@@ -245,7 +245,7 @@ void GenericAPICore::countOpenConnections()
 	m_currentConnections = 0;
 	m_maxConnections = m_serverConnections.size();
 
-    for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++)
+    for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end();++conIter)
     {
 		GenericConnection *con = *conIter;
 		if (con->isConnected())
diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.cpp b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.cpp
index 7eb0c47d..7eab52a8 100644
--- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.cpp
+++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.cpp
@@ -168,7 +168,7 @@ void ChatAvatarCore::setLoginPriority(int loginPriority)
 	m_loginPriority = loginPriority;
 }
 
-void ChatAvatarCore::setEmail(const Plat_Unicode::String email)
+void ChatAvatarCore::setEmail(static const Plat_Unicode::String &email)
 {
 	m_email = email;
 }
@@ -178,7 +178,7 @@ void ChatAvatarCore::setInboxLimit(unsigned inboxLimit)
 	m_inboxLimit = inboxLimit;
 }
 
-void ChatAvatarCore::setStatusMessage(const Plat_Unicode::String statusMessage)
+void ChatAvatarCore::setStatusMessage(const Plat_Unicode::String &statusMessage)
 {
     m_statusMessage = statusMessage;
 }
diff --git a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.h b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.h
index b2e1aaae..7ba48a71 100644
--- a/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.h
+++ b/external/3rd/library/soePlatform/ChatAPI/projects/ChatAPI/ChatAvatarCore.h
@@ -47,9 +47,9 @@ namespace ChatSystem
 
 		void setAttributes(unsigned long attributes);
 		void setLoginPriority(int loginPriority);
-		void setEmail(const Plat_Unicode::String email);
+		void setEmail(const Plat_Unicode::String &email);
 		void setInboxLimit(unsigned inboxLimit);
-        void setStatusMessage(const Plat_Unicode::String statusMessage);
+        void setStatusMessage(const Plat_Unicode::String &statusMessage);
 
 		ChatAvatarCore &operator=(const ChatAvatarCore &rhs);
 
diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeUtils.h b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeUtils.h
index a9c0c322..d6528a19 100644
--- a/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeUtils.h
+++ b/external/3rd/library/soePlatform/ChatAPI/utils/Unicode/UnicodeUtils.h
@@ -216,7 +216,7 @@ namespace Plat_Unicode
 		unsigned index = 0;
 		s.resize(nstr.size());
 		const NarrowString::const_iterator end = nstr.end();
-		for (NarrowString::const_iterator iter = nstr.begin(); iter != end; iter++)
+		for (NarrowString::const_iterator iter = nstr.begin(); iter != end; ++iter)
 		{
 		        // Cast to unsigned char so that we don't pick up a negative value 
 			// for the unsigned short
@@ -236,7 +236,7 @@ namespace Plat_Unicode
 		unsigned index = 0;
 		str.resize(nstr.size());
 		const NarrowString::const_iterator end = nstr.end();
-		for (NarrowString::const_iterator iter = nstr.begin(); iter != end; iter++)
+		for (NarrowString::const_iterator iter = nstr.begin(); iter != end; ++iter)
 		{
 			str[index++] = *iter;
 		}
@@ -259,7 +259,7 @@ namespace Plat_Unicode
 		unsigned index = 0;
 		s.resize(str.size());
 		const String::const_iterator end = str.end();
-		for (String::const_iterator iter = str.begin(); iter != end; iter++)
+		for (String::const_iterator iter = str.begin(); iter != end; ++iter)
 		{
 			s[index++] = (char)*iter;
 		}
@@ -281,7 +281,7 @@ namespace Plat_Unicode
 		unsigned index = 0;
 		nstr.resize(str.size());
 		const String::const_iterator end = str.end();
-		for (String::const_iterator iter = str.begin(); iter != end; iter++)
+		for (String::const_iterator iter = str.begin(); iter != end; ++iter)
 		{
 			nstr[index++] = (char)*iter;
 		}