diff --git a/GPU/GPUTracking/CMakeLists.txt b/GPU/GPUTracking/CMakeLists.txt
index a976e5c93b7c6..29c95eba4280a 100644
--- a/GPU/GPUTracking/CMakeLists.txt
+++ b/GPU/GPUTracking/CMakeLists.txt
@@ -405,7 +405,7 @@ target_sources(${targetName}
                BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR})
 
 make_directory(${CMAKE_CURRENT_BINARY_DIR}/genGPUArch)
-set(GPU_CONST_PARAM_ARCHITECTUES AMPERE TURING VEGA MI2xx)
+set(GPU_CONST_PARAM_ARCHITECTUES AMPERE TURING VEGA MI100)
 set(GPU_CONST_PARAM_FILES "")
 foreach(GPU_ARCH ${GPU_CONST_PARAM_ARCHITECTUES})
   set(PARAMFILE ${CMAKE_CURRENT_BINARY_DIR}/genGPUArch/gpu_const_param_${GPU_ARCH}.par)
diff --git a/GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h b/GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h
index 29aa3808506dc..0886f993a3170 100644
--- a/GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h
+++ b/GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h
@@ -23,7 +23,7 @@
 // GPU Run Configuration
 #if defined(GPUCA_GPUCODE) && !defined(GPUCA_GPUCODE_GENRTC) && !defined(GPUCA_GPUCODE_NO_LAUNCH_BOUNDS) // Avoid including for RTC generation besides normal include protection.
   // GPU-architecture-dependent default settings
-  #if defined(GPUCA_GPUTYPE_MI2xx)
+  #if defined(GPUCA_GPUTYPE_MI100)
     #define GPUCA_WARP_SIZE 64
     #define GPUCA_THREAD_COUNT_DEFAULT 256
     #define GPUCA_LB_GPUTPCCreateTrackingData 256
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx b/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx
index 16d96dad17d16..212850f107098 100644
--- a/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx
+++ b/GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx
@@ -92,6 +92,9 @@ struct GPUTPCGMMergerSortTracks_comp {
   {
     const GPUTPCGMMergedTrack& GPUrestrict() a = mCmp[aa];
     const GPUTPCGMMergedTrack& GPUrestrict() b = mCmp[bb];
+    if (a.OK() != b.OK()) {
+      return a.OK();
+    }
     if (a.CCE() != b.CCE()) {
       return a.CCE() > b.CCE();
     }
diff --git a/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx b/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
index 970b42f6ee78a..b45f08ed00f50 100644
--- a/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
+++ b/GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
@@ -151,6 +151,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger* GPUrestrict() merger, int32_
         const float rmax = (83.5f + param.rec.tpc.sysClusErrorMinDist);
         if (r2 < rmax * rmax) {
           MarkClusters(clusters, ihitMergeFirst, ihit, wayDirection, GPUTPCGMMergedTrackHit::flagRejectErr);
+          continue;
         }
       }
 
diff --git a/dependencies/FindO2GPU.cmake b/dependencies/FindO2GPU.cmake
index 51812fc84ef1a..9f335eaa6600a 100644
--- a/dependencies/FindO2GPU.cmake
+++ b/dependencies/FindO2GPU.cmake
@@ -10,7 +10,7 @@
 # or submit itself to any jurisdiction.
 
 # NOTE!!!! - Whenever this file is changed, move it over to alidist/resources
-# FindO2GPU.cmake Version 3
+# FindO2GPU.cmake Version 4
 
 if(NOT DEFINED ENABLE_CUDA)
   set(ENABLE_CUDA "AUTO")
@@ -58,10 +58,10 @@ function(set_target_hip_arch target)
     target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_VEGA)
   elseif(HIP_AMDGPUTARGET AND HIP_AMDGPUTARGET MATCHES "gfx908")
     message(STATUS "Using optimized HIP settings for MI100 GPU")
-    target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI2xx)
+    target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI100)
   elseif(HIP_AMDGPUTARGET AND HIP_AMDGPUTARGET MATCHES "gfx90a")
     message(STATUS "Using optimized HIP settings for MI210 GPU")
-    target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI2xx)
+    target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI100)
   else()
     target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_VEGA)
   endif()