diff --git a/Common/System/OSD.cpp b/Common/System/OSD.cpp
index 5b2972caa0..7c3bb7c7c1 100644
--- a/Common/System/OSD.cpp
+++ b/Common/System/OSD.cpp
@@ -123,7 +123,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
 			}
 			// Else update it.
 			entry.numericID = achievementID;
-			entry.endTime = now + 2.0f; // forever_s;
+			entry.endTime = now + forever_s;
 			return;
 		}
 	}
@@ -138,7 +138,7 @@ void OnScreenDisplay::ShowAchievementProgress(int achievementID, bool show) {
 	entry.numericID = achievementID;
 	entry.type = OSDType::ACHIEVEMENT_PROGRESS;
 	entry.startTime = now;
-	entry.endTime = now + 2.0f; // forever_s;
+	entry.endTime = now + forever_s;
 	entries_.insert(entries_.begin(), entry);
 }
 
diff --git a/Core/RetroAchievements.cpp b/Core/RetroAchievements.cpp
index ff4fdbaaf2..4eda3192ee 100644
--- a/Core/RetroAchievements.cpp
+++ b/Core/RetroAchievements.cpp
@@ -302,7 +302,6 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
 		// If a progress indicator is already visible, it should be updated with the new icon and text, and the two second timer should be restarted.
 		g_OSD.ShowAchievementProgress(event->achievement->id, true);
 		break;
-		/*
 	case RC_CLIENT_EVENT_ACHIEVEMENT_PROGRESS_INDICATOR_UPDATE:
 		INFO_LOG(ACHIEVEMENTS, "Progress indicator update: %s, progress: '%s' (%f)", event->achievement->title, event->achievement->measured_progress, event->achievement->measured_percent);
 		g_OSD.ShowAchievementProgress(event->achievement->id, true);
@@ -315,7 +314,6 @@ static void event_handler_callback(const rc_client_event_t *event, rc_client_t *
 		// If a progress indicator is already visible, it should be updated with the new icon and text, and the two second timer should be restarted.
 		g_OSD.ShowAchievementProgress(0, false);
 		break;
-		*/
 	case RC_CLIENT_EVENT_LEADERBOARD_TRACKER_SHOW:
 		INFO_LOG(ACHIEVEMENTS, "Leaderboard tracker show: '%s' (id %d)", event->leaderboard_tracker->display, event->leaderboard_tracker->id);
 		// A leaderboard_tracker has become active. The handler should show the tracker text on screen.
diff --git a/ext/rcheevos b/ext/rcheevos
index 97db619aa4..813163c10c 160000
--- a/ext/rcheevos
+++ b/ext/rcheevos
@@ -1 +1 @@
-Subproject commit 97db619aa4de15fe19887255e75899ae65d2e432
+Subproject commit 813163c10c0745322affb8342ca2ab3bb30bfcbf