diff --git a/rehlds/HLTV/Proxy/src/Proxy.cpp b/rehlds/HLTV/Proxy/src/Proxy.cpp
index 90a9f1d..eb5cfe9 100644
--- a/rehlds/HLTV/Proxy/src/Proxy.cpp
+++ b/rehlds/HLTV/Proxy/src/Proxy.cpp
@@ -1301,11 +1301,10 @@ unsigned int Proxy::GetChallengeNumber(NetAddress *host)
 	int i;
 	int oldest = 0;
 	float oldestTime = 9.9999997e37f;
-	const float challengeLife = 40.0f;
 
 	for (i = 0; i < MAX_CHALLENGES; i++)
 	{
-		if (m_Challenges[i].adr.Equal(host)) {
+		if (m_Challenges[i].adr.EqualBase(host)) {
 			break;
 		}
 
@@ -1343,7 +1342,7 @@ bool Proxy::CheckChallenge(NetAddress *from, unsigned int challengeNumber)
 	{
 		if (from->EqualBase(&it.adr)) {
 			if (it.challenge == challengeNumber) {
-				return (m_SystemTime - it.time <= 40);
+				return (m_SystemTime - it.time <= PROXY_CHALLENGE_LIFE);
 			}
 
 			break;
diff --git a/shared_icc.gradle b/shared_icc.gradle
index 036fa00..1b42d6e 100644
--- a/shared_icc.gradle
+++ b/shared_icc.gradle
@@ -16,7 +16,11 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
 						intelExtensions: false,
 						asmBlocks: true,
 
-						positionIndependentCode: false
+						positionIndependentCode: false,
+
+						extraDefines: [
+							'_GLIBCXX_USE_CXX11_ABI': 0,
+						]
 				),
 
 				linkerOptions: new GccToolchainConfig.LinkerOptions(
@@ -41,7 +45,11 @@ rootProject.ext.createIccConfig = { boolean release, BinaryKind binKind ->
 
 						noBuiltIn: true,
 						intelExtensions: false,
-						asmBlocks: true
+						asmBlocks: true,
+
+						extraDefines: [
+							'_GLIBCXX_USE_CXX11_ABI': 0,
+						]
 				),
 
 				linkerOptions: new GccToolchainConfig.LinkerOptions(