diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 59838e54fd4cdfea66901b60a2faead797ca4143..5088bb30fc9b101394683ea5260e76f048f39c3a 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -24,6 +24,7 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/rich/fitter
 ${CBMBASE_DIR} 
 
 ${CBMDATA_DIR}
+${CBMDATA_DIR}/raw
 ${CBMDATA_DIR}/sts
 ${CBMDATA_DIR}/much
 ${CBMDATA_DIR}/mvd
@@ -32,6 +33,8 @@ ${CBMDATA_DIR}/tof
 ${CBMDATA_DIR}/rich
 ${CBMDATA_DIR}/global
 
+${CBMROOT_SOURCE_DIR}/core/qa
+
 ${CBMROOT_SOURCE_DIR}/rich/reco/fitter
 
 ${CBMROOT_SOURCE_DIR}/reco/L1
diff --git a/reco/detectors/sts/CMakeLists.txt b/reco/detectors/sts/CMakeLists.txt
index b93c5080909c83014d73021fb64936857c373b07..7c02555e7ac3c3ce843415e6c865da68e8aeeaf4 100644
--- a/reco/detectors/sts/CMakeLists.txt
+++ b/reco/detectors/sts/CMakeLists.txt
@@ -39,7 +39,6 @@ ${CBMROOT_SOURCE_DIR}/reco/detectors/sts/unpack
 ${CBMROOT_SOURCE_DIR}/reco/base
 
 #QA
-${CBMROOT_SOURCE_DIR}/qa
 ${CBMROOT_SOURCE_DIR}/core/qa
 
 # Base
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
index 75a4282f6bfe8452b33fe9a383ecb4751611e014..3d85f9a283f78695a1ae79e3094393d8c89b7268 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackAlgo.cxx
@@ -13,9 +13,7 @@
 #include <cstdint>
 #include <iomanip>
 
-// FIXME
-// #include "StsXyterFinalHit.h"
-#include "raw/StsXyterFinalHit.h"
+#include "StsXyterFinalHit.h"
 
 
 CbmStsUnpackAlgo::CbmStsUnpackAlgo() : CbmRecoUnpackAlgo("CbmStsUnpackAlgo") {}
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
index adbb6d35401a3b802a21c6b0ac3bfbf236fb2a7a..07acc65f5a9508314f9f8e0e0576783eb054b43b 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.cxx
@@ -1,8 +1,6 @@
 #include "CbmStsUnpackMonitor.h"
 
-// FIXME
-// #include "CbmQaCanvas.h"
-#include "../qa/CbmQaCanvas.h"
+#include "CbmQaCanvas.h"
 
 #include <FairRun.h>
 #include <FairRunOnline.h>
@@ -312,6 +310,7 @@ Bool_t CbmStsUnpackMonitor::ResetMsComponentSizeHistos(UInt_t component)
     fvhMsSize[component]->Reset();
     fvhMsSizeTime[component]->Reset();
   }
+  return kTRUE;
 }
 
 Bool_t CbmStsUnpackMonitor::ResetHistograms()
diff --git a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
index 41e99d6f0ac71aaf0f90c660f5dbd761e1c415cf..ab1536a39ab31bf3a6f295101f936efa9509502e 100644
--- a/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
+++ b/reco/detectors/sts/unpack/CbmStsUnpackMonitor.h
@@ -17,9 +17,7 @@
 
 #include <cstdint>
 
-// FIXME
-// #include "StsXyterMessage.h"
-#include "raw/StsXyterMessage.h"
+#include "StsXyterMessage.h"
 
 /** @remark On pointers to histograms: Why not use shared pointers here, than you do not need to take care of deleting them. Right now I think you have a massive memory leak. PR */