diff --git a/core/qa/CMakeLists.txt b/core/qa/CMakeLists.txt
index d4a6f8e18c11332c7024c170e54299ca594b9b0c..f6e9c92237b240ae50f615be424d8c5146985fd4 100644
--- a/core/qa/CMakeLists.txt
+++ b/core/qa/CMakeLists.txt
@@ -33,6 +33,6 @@ set(INTERFACE_DEPENDENCIES
 
 generate_cbm_library()
 
-Install(FILES CbmQaTask.h CbmQaCanvas.h CbmQaTable.h CbmQaHist.h CbmQaEff.h CbmQaPie.h CbmQaConstants.h
+Install(FILES CbmQaTask.h CbmQaCanvas.h CbmQaTable.h CbmQaHist.h CbmQaEff.h CbmQaPie.h CbmQaConstants.h CbmQaCmpDrawer.h
         DESTINATION include
        )
diff --git a/macro/mcbm/mcbm_qa.C b/macro/mcbm/mcbm_qa.C
index 6c71367ca99e015b29b27e6cedbac76a3bb0ecc0..363d9c0059d99f2c3d18b8cdb34cceedb5111523 100644
--- a/macro/mcbm/mcbm_qa.C
+++ b/macro/mcbm/mcbm_qa.C
@@ -186,6 +186,16 @@ void mcbm_qa(Int_t nEvents = 0, TString dataset = "data/mcbm_beam_2020_03_test",
   // appears, if the CbmMuchHitFinderQa task runs before the CbmCaInputQaSts
   // task.
 
+  // ----- STS QA -----------------------------------------------------------
+  if (bUseSts) {
+    // CA Input QA
+    auto* pCaInputSts = new CbmCaInputQaSts(verbose, bUseMC);
+    pCaInputSts->SetEfficiencyThrsh(0.5, 0, 100);
+    run->AddTask(pCaInputSts);
+  }
+  // ------------------------------------------------------------------------
+
+
   // ----- MUCH QA  ---------------------------------------------------------
   if (bUseMuch) {
     run->AddTask(new CbmMuchTransportQa());
@@ -194,7 +204,7 @@ void mcbm_qa(Int_t nEvents = 0, TString dataset = "data/mcbm_beam_2020_03_test",
 
     CbmMuchHitFinderQa* muchHitFinderQa = new CbmMuchHitFinderQa();
     muchHitFinderQa->SetGeoFileName(muchParFile);
-    //run->AddTask(muchHitFinderQa);
+    run->AddTask(muchHitFinderQa);
 
     // CA Input QA
     auto* pCaInputMuch = new CbmCaInputQaMuch(verbose, bUseMC);
@@ -203,15 +213,6 @@ void mcbm_qa(Int_t nEvents = 0, TString dataset = "data/mcbm_beam_2020_03_test",
   }
   // ------------------------------------------------------------------------
 
-  // ----- STS QA -----------------------------------------------------------
-  if (bUseSts) {
-    // CA Input QA
-    auto* pCaInputSts = new CbmCaInputQaSts(verbose, bUseMC);
-    pCaInputSts->SetEfficiencyThrsh(0.5, 0, 100);
-    run->AddTask(pCaInputSts);
-  }
-  // ------------------------------------------------------------------------
-
   // ----- TRD QA -----------------------------------------------------------
   if (bUseTrd) {
     // CA Input QA
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
index d60e2b742398e5a7191b1dc5149f35b64b691dc2..f8d104a0d1949e458d904c5f4e50e2c614dc2606 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.cxx
@@ -363,7 +363,6 @@ void CbmMuchHitFinderQa::FinishTask()
 // -------------------------------------------------------------------------
 void CbmMuchHitFinderQa::DrawCanvases()
 {
-
   for (Int_t i = 0; i < fNstations; i++) {
     fCanvPointsInCluster->cd(i + 1);
     fhPointsInCluster[i]->DrawCopy("", "");
@@ -386,13 +385,15 @@ void CbmMuchHitFinderQa::DrawCanvases()
     histo->Draw();  //necessary to create stats pointer
     fCanvPull->Update();
     TPaveStats* st = (TPaveStats*) histo->FindObject("stats");
-    st->SetX1NDC(0.621);
-    st->SetX2NDC(0.940);
-    st->SetY1NDC(0.657);
-    st->SetY2NDC(0.929);
-    st->SetOptStat(1110);
-    st->SetOptFit(11);
-    //st->SetTextSize(0.04);
+    if (st) {
+      st->SetX1NDC(0.621);
+      st->SetX2NDC(0.940);
+      st->SetY1NDC(0.657);
+      st->SetY2NDC(0.929);
+      st->SetOptStat(1110);
+      st->SetOptFit(11);
+      //st->SetTextSize(0.04);
+    }
     histo->DrawCopy("", "");
     //version below only changes canvas but not hist folder
     //TH1* hClone = histo->DrawCopy("", "");
@@ -413,13 +414,15 @@ void CbmMuchHitFinderQa::DrawCanvases()
     histo->Draw();  //necessary to create stats pointer
     fCanvResidual->Update();
     TPaveStats* st = (TPaveStats*) histo->FindObject("stats");
-    st->SetX1NDC(0.621);
-    st->SetX2NDC(0.940);
-    st->SetY1NDC(0.657);
-    st->SetY2NDC(0.929);
-    st->SetOptStat(1110);
-    st->SetOptFit(11);
-    //st->SetTextSize(0.04);
+    if (st) {
+      st->SetX1NDC(0.621);
+      st->SetX2NDC(0.940);
+      st->SetY1NDC(0.657);
+      st->SetY2NDC(0.929);
+      st->SetOptStat(1110);
+      st->SetOptFit(11);
+      //st->SetTextSize(0.04);
+    }
     histo->DrawCopy("", "");
   }
 }