diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp
index 1a5d1122..dffb077b 100644
--- a/src/backend/cpu/platform/BasicCpuInfo.cpp
+++ b/src/backend/cpu/platform/BasicCpuInfo.cpp
@@ -387,8 +387,10 @@ xmrig::CpuThreads xmrig::BasicCpuInfo::threads(const Algorithm &algorithm, uint3
 
 #   ifdef XMRIG_ALGO_GHOSTRIDER
     switch (algorithm.id()) {
-        case Algorithm::GHOSTRIDER_RTM: return CpuThreads(std::max<size_t>(count / 2, 1), 8);
-        case Algorithm::FLEX_KCN:       return CpuThreads(std::max<size_t>(count / 2, 1), 1);
+        case Algorithm::GHOSTRIDER_RTM: return CpuThreads(std::max<size_t>(count_limit2, 1), 8);
+        case Algorithm::FLEX_KCN:       return CpuThreads(std::max<size_t>(count_limit2, 1), 1);
+        default:
+            break;
     }
 #   endif
 
diff --git a/src/core/MoBenchmark.h b/src/core/MoBenchmark.h
index 369a6785..cc53433c 100644
--- a/src/core/MoBenchmark.h
+++ b/src/core/MoBenchmark.h
@@ -55,8 +55,8 @@ class MoBenchmark : public IJobResultListener {
             // below here use prefetch-disabled MSR setup, keep them grouped
             // so MSR setting doesn't have to flip back and forth
 #           ifdef XMRIG_ALGO_GHOSTRIDER
-            Algorithm::FLEX_KCN,
             Algorithm::GHOSTRIDER_RTM,
+            Algorithm::FLEX_KCN,
 #           endif
 #           ifdef XMRIG_ALGO_CN_HEAVY
             Algorithm::CN_HEAVY_XHV,