diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
index daf829d509afdd7125f37c97b1235383a8cdf7b1..486597bb9045b1272c3fa3460aac1ee4f08cbffd 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.cxx
@@ -20,16 +20,17 @@
 #include "TimesliceMetaData.h"
 
 /// FAIRROOT headers
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRunOnline.h"
+#include <FairLogger.h>
+#include <FairRootManager.h>
+#include <FairRunOnline.h>
 
 /// FAIRSOFT headers (geant, boost, ...)
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "THttpServer.h"
+#include <TCanvas.h>
+#include <TClonesArray.h>
+#include <TFolder.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <THttpServer.h>
 
 template<>
 void CbmAlgoBuildRawEvents::LoopOnSeeds<Double_t>();
diff --git a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
index ce0640c01126f5f6133f1d1fea8ac664bb828388..2bd074b70ad40a9fdcd7d2e72119c664e3a2e2b9 100644
--- a/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
+++ b/reco/eventbuilder/digis/CbmTaskBuildRawEvents.cxx
@@ -10,15 +10,16 @@
 #include "CbmDigiManager.h"
 #include "CbmEvent.h"
 
-#include "FairLogger.h"
-#include "FairRootManager.h"
-#include "FairRunOnline.h"
-
-#include "TClonesArray.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "THttpServer.h"
+#include <FairLogger.h>
+#include <FairRootManager.h>
+#include <FairRunOnline.h>
+
+#include <TClonesArray.h>
 #include <TFile.h>
+#include <TFolder.h>
+#include <TH1.h>
+#include <TH2.h>
+#include <THttpServer.h>
 
 #include <iomanip>
 
@@ -388,7 +389,7 @@ void CbmTaskBuildRawEvents::SaveHistos()
       return;
     }
     FairSink* sink = FairRootManager::Instance()->GetSink();
-    sink->WriteObject(fpAlgo->GetOutFolder(), nullptr);
+    sink->WriteObject(dynamic_cast<TObject*>(fpAlgo->GetOutFolder()), nullptr);
   }
   else {