diff --git a/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx b/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
index 439540322d1ec13d60f397726c10cfdcea66b14b..0cf9dd52a4a13c658888b504a428af743c4a6b07 100755
--- a/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
+++ b/Database/AthenaPOOL/AthenaPoolTools/src/BookkeeperDumper.cxx
@@ -53,8 +53,10 @@ void BookkeeperDumper::handle(const Incident& inc)
   if (inc.type()=="BeginInputFile") {
     ServiceHandle<StoreGateSvc> mdstore("StoreGateSvc/InputMetaDataStore", name());
     if (mdstore.retrieve().isSuccess()) {
-      const DataHandle<xAOD::CutBookkeeperContainer> compBook(NULL);
-      if (mdstore->retrieve(compBook, "CutBookkeepers").isSuccess()) {
+      //
+      const DataHandle<xAOD::CutBookkeeperContainer> compBook(nullptr);
+      if (mdstore->retrieve(compBook, "CutBookkeepers").isSuccess()) 
+      {
         ATH_MSG_INFO("CBK size = " << compBook->size());
         for (auto it = compBook->begin(); it != compBook->end(); ++it) {
           ATH_MSG_INFO("CBK name= " << (*it)->name() << " cycle=" << (*it)->cycle() << " stream=" << (*it)->inputStream() << " N=" << (*it)->nAcceptedEvents() << " W=" << (*it)->sumOfEventWeights() << " nc=" << (*it)->nChildren());
@@ -62,8 +64,10 @@ void BookkeeperDumper::handle(const Incident& inc)
       } else {
         ATH_MSG_INFO("CBK No CutBookkeepers " << mdstore->dump());
       }
-      const DataHandle<xAOD::CutBookkeeperContainer> incompBook(NULL);
-      if (mdstore->retrieve(incompBook, "IncompleteCutBookkeepers").isSuccess()) {
+      //
+      const DataHandle<xAOD::CutBookkeeperContainer> incompBook(nullptr);
+      if (mdstore->retrieve(incompBook, "IncompleteCutBookkeepers").isSuccess()) 
+      {
         ATH_MSG_INFO("ICBK size = " << incompBook->size());
         for (auto it = incompBook->begin(); it != incompBook->end(); ++it) {
           ATH_MSG_INFO("ICBK name= " << (*it)->name() << " cycle=" << (*it)->cycle() << " stream=" << (*it)->inputStream() << " N=" << (*it)->nAcceptedEvents() << " W=" << (*it)->sumOfEventWeights() << " nc=" << (*it)->nChildren());
@@ -71,6 +75,29 @@ void BookkeeperDumper::handle(const Incident& inc)
       } else {
         ATH_MSG_INFO("ICBK No CutBookkeepers " << mdstore->dump());
       }
+      //
+      const DataHandle<xAOD::CutBookkeeperContainer> pcompBook(nullptr);
+      if (mdstore->retrieve(pcompBook, "PDFSumOfWeights").isSuccess()) 
+      {
+        ATH_MSG_INFO("PCBK size = " << pcompBook->size());
+        for (auto it = pcompBook->begin(); it != pcompBook->end(); ++it) {
+          ATH_MSG_INFO("PCBK name= " << (*it)->name() << " cycle=" << (*it)->cycle() << " stream=" << (*it)->inputStream() << " N=" << (*it)->nAcceptedEvents() << " W=" << (*it)->sumOfEventWeights() << " nc=" << (*it)->nChildren());
+        }
+      } else {
+        ATH_MSG_INFO("PCBK No CutBookkeepers " << mdstore->dump());
+      }
+      //
+      const DataHandle<xAOD::CutBookkeeperContainer> ipcompBook(nullptr);
+      if (mdstore->retrieve(ipcompBook, "IncompletePDFSumOfWeights").isSuccess()) 
+      {
+        ATH_MSG_INFO("IPCBK size = " << ipcompBook->size());
+        for (auto it = ipcompBook->begin(); it != ipcompBook->end(); ++it) {
+          ATH_MSG_INFO("IPCBK name= " << (*it)->name() << " cycle=" << (*it)->cycle() << " stream=" << (*it)->inputStream() << " N=" << (*it)->nAcceptedEvents() << " W=" << (*it)->sumOfEventWeights() << " nc=" << (*it)->nChildren());
+        }
+      } else {
+        ATH_MSG_INFO("IPCBK No CutBookkeepers " << mdstore->dump());
+      }
+      //
     }
   }
 }
diff --git a/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx b/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
index 279708809eb24c7389674a2f0751d9e52325a906..f7de464878772bc2980fe958ad27272946052f22 100644
--- a/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
+++ b/Event/EventBookkeeperTools/Root/BookkeeperTool.cxx
@@ -386,7 +386,7 @@ StatusCode BookkeeperTool::copyContainerToOutput(const std::string& outname)
 {
 
   // Get the complete bookkeeper collection of the output meta-data store
-  xAOD::CutBookkeeperContainer* contBook(NULL); 
+  xAOD::CutBookkeeperContainer* contBook(nullptr); 
   if( !(outputMetaStore()->retrieve( contBook, outname) ).isSuccess() ) {
     ATH_MSG_ERROR( "Could not get " << outname << " CutBookkeepers from output MetaDataStore" );
     return StatusCode::FAILURE;
diff --git a/Event/EventBookkeeperTools/src/CutFlowSvc.cxx b/Event/EventBookkeeperTools/src/CutFlowSvc.cxx
index e0861c2b12109d6101e0036abeffa1b11792b152..8cecea2ef950cbbc7c2e057d3d211a810caa265d 100644
--- a/Event/EventBookkeeperTools/src/CutFlowSvc.cxx
+++ b/Event/EventBookkeeperTools/src/CutFlowSvc.cxx
@@ -481,20 +481,12 @@ StatusCode CutFlowSvc::determineCycleNumberFromInput( const std::string& collNam
     // is connected to just a single input file.
     const xAOD::CutBookkeeperContainer* constColl = 0;
     ATH_CHECK( m_inMetaDataStore->retrieve( constColl, collName ) );
-    xAOD::CutBookkeeperContainer* tmpColl = const_cast<xAOD::CutBookkeeperContainer*>(constColl);
-    if ( !(tmpColl->hasStore()) ) {
-      ATH_MSG_VERBOSE("Setting store of xAOD::CutBookkeeperContainer");
-      // Get also the auxilliary store
-      // const SG::IConstAuxStore* auxColl = 0;
-      const xAOD::CutBookkeeperAuxContainer* auxColl = 0;
-      ATH_CHECK( m_inMetaDataStore->retrieve(auxColl, collName+"Aux.") );
-      tmpColl->setConstStore( auxColl );
-    }
     // Now, iterate over all CutBookkeepers and search for the highest cycle number
     int maxCycle=0;
-    for ( std::size_t i=0; i<tmpColl->size(); ++i ) {
+    for ( std::size_t i=0; i<constColl->size(); ++i ) {
       // Get the current old EBK
-      const xAOD::CutBookkeeper* cbk = tmpColl->at(i);
+      //const xAOD::CutBookkeeper* cbk = tmpColl->at(i);
+      const xAOD::CutBookkeeper* cbk = constColl->at(i);
       int inCycle = cbk->cycle();
       if (inCycle > maxCycle) maxCycle = inCycle;
     }