diff --git a/Detectors/GlobalTracking/src/MatchTPCITS.cxx b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
index eb2a2212edb30..8bf3449dd52dc 100644
--- a/Detectors/GlobalTracking/src/MatchTPCITS.cxx
+++ b/Detectors/GlobalTracking/src/MatchTPCITS.cxx
@@ -661,7 +661,8 @@ bool MatchTPCITS::prepareITSData()
     auto pattID = clus.getPatternID();
     unsigned int npix;
 #ifdef ENABLE_UPGRADES
-    if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
+    auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
+    if ((pattID == o2::itsmft::CompCluster::InvalidPatternID) || ((withITS3) ? mIT3Dict->isGroup(pattID, ib) : mITSDict->isGroup(pattID))) { // braces guarantee evaluation order
 #else
     if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mITSDict->isGroup(pattID)) {
 #endif
@@ -671,7 +672,7 @@ bool MatchTPCITS::prepareITSData()
     } else {
 #ifdef ENABLE_UPGRADES
       if (withITS3) {
-        npix = mIT3Dict->getNpixels(pattID);
+        npix = mIT3Dict->getNpixels(pattID, ib);
       } else {
         npix = mITSDict->getNpixels(pattID);
       }
@@ -1434,8 +1435,7 @@ void MatchTPCITS::refitWinners(pmr::vector<o2::dataformats::TrackTPCITS>& matche
 
 #ifdef WITH_OPENMP
 #pragma omp parallel for schedule(dynamic) num_threads(mNThreads) \
-  reduction(+                                                     \
-            : nFailedRefit)
+  reduction(+ : nFailedRefit)
 #endif
   for (int ifit = 0; ifit < nToFit; ifit++) {
     int iTPC = tpcToFit[ifit], iITS;
diff --git a/Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h b/Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h
index 302b1de201ab1..f8c3c0dcb670c 100644
--- a/Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h
+++ b/Detectors/Vertexing/StrangenessTracking/include/StrangenessTracking/StrangenessTracker.h
@@ -279,20 +279,20 @@ class StrangenessTracker
     for (unsigned int iClus{0}; iClus < ITSclus.size(); ++iClus) {
       auto& clus = ITSclus[iClus];
       auto pattID = clus.getPatternID();
+      auto ib = o2::its3::constants::detID::isDetITS3(clus.getChipID());
       int npix;
       o2::itsmft::ClusterPattern patt;
 
-      if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID)) {
+      if (pattID == o2::itsmft::CompCluster::InvalidPatternID || mdict->isGroup(pattID, ib)) {
         patt.acquirePattern(pattIt);
         npix = patt.getNPixels();
       } else {
 
-        npix = mdict->getNpixels(pattID);
-        patt = mdict->getPattern(pattID);
+        npix = mdict->getNpixels(pattID, ib);
+        patt = mdict->getPattern(pattID, ib);
       }
       clusSizeVec[iClus] = npix;
     }
-    // LOG(info) << " Patt Npixel: " << pattVec[0].getNPixels();
   }
 #endif