diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
index 29ddf470f..5927776f1 100644
--- a/src/achievements/achievement.cpp
+++ b/src/achievements/achievement.cpp
@@ -105,20 +105,20 @@ void Achievement::setGoalValue(std::string &goal_string, int value)
     if(m_achieved) // This should not happen, but it costs little to double-check
         return;
 
-    bool AO = true;
-    bool SAAO = true;
+    bool and_or = true;
+    bool sum_andatonce = true;
     if (goal_string.compare(0 /*start of sub-string*/,5/*length*/,"LOGC-") == 0)
     {
-        AO = false;
+        and_or = false;
         goal_string = goal_string.substr(5,999);
     }
     else if (goal_string.compare(0 /*start of sub-string*/,5/*length*/,"LOGM-") == 0)
     {
-        SAAO = false;
+        sum_andatonce = false;
         goal_string = goal_string.substr(5,999);
     }
 
-    bool found = recursiveSetGoalValue(m_progress_goal_tree, goal_string, value, AO, SAAO);
+    bool found = recursiveSetGoalValue(m_progress_goal_tree, goal_string, value, and_or, sum_andatonce);
 
     // If a value has been updated, check for completion
     if (found && recursiveCompletionCheck(m_progress_goal_tree, m_achievement_info->m_goal_tree))
diff --git a/src/achievements/achievements_status.cpp b/src/achievements/achievements_status.cpp
index 1622906d0..d47707fac 100644
--- a/src/achievements/achievements_status.cpp
+++ b/src/achievements/achievements_status.cpp
@@ -450,8 +450,6 @@ void AchievementsStatus::increaseDataVar(unsigned int achieve_data_id, int incre
     if (achieve_data_id<ACHIEVE_DATA_NUM)
     {
         m_variables[achieve_data_id].counter += increase;
-        if (m_variables[achieve_data_id].counter > 10000000)
-            m_variables[achieve_data_id].counter = 10000000;
 
         updateAchievementsProgress(UP_ACHIEVEMENT_DATA, achieve_data_id);
     }