diff --git a/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx b/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
index 38c12125499604d284fd613fe9ec8bc06f2357d6..476f70b4a6ca366688ae7bb8d2eae32de446bb85 100644
--- a/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
+++ b/Calorimeter/CaloDetDescrCnv/CaloIdCnv/src/EcalIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ EcalIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_ecalId);
+    pObj = SG::asStorable(m_ecalId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt b/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
index c80211c6de582ec835b545ef0cc21070d5f2dfe2..5f2e903394af40ccf8a920ea4f31acd686f3a539 100644
--- a/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloEventCnv/FaserCaloSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( FaserCaloSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel FaserCaloSimEventTPCnv FaserCaloSimEvent )
 
 # Install files from the package:
-atlas_install_headers( FaserCaloSimEventAthenaPool )
+# atlas_install_headers( FaserCaloSimEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
diff --git a/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx b/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
index 2810c5d0e85bca6f566712510c3962e1f7d81bd0..7dca6220b0b478ebd250c7cfa1dbd02c8ebea7bb 100644
--- a/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
+++ b/Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.cxx
@@ -35,9 +35,26 @@ StatusCode GenEventReadAlg::execute()
     const HepMC::GenEvent* theEvent = h_mcEvents->at(0);
     if (theEvent->particles_size() != 1 && theEvent->vertices_size() != 1) return StatusCode::FAILURE;
     // h_mcEvents->at(0)->print( msg().stream() );
+#ifdef HEPMC3
+    const HepMC::ConstGenParticlePtr& pHat {theEvent->particles().front()};
+    for (auto p : theEvent->particles())
+    {
+        m_cosThetaHist->Fill(-p->momentum().y()/p->momentum().rho());
+        m_phiHist->Fill(atan2(p->momentum().x(), p->momentum().z()));
+    }
+
+    for (auto v : theEvent->vertices())
+    {
+        HepMC::FourVector vOffset { v->position().x() , v->position().y(), v->position().z() - m_zOffset, v->position().t() };
+        m_rVertexHist->Fill(vOffset.rho());
+        m_rPerpHist->Fill(pow(vOffset.rho(), 2) - pow((vOffset.x() * pHat->momentum().x() +
+                                                       vOffset.y() * pHat->momentum().y() + 
+                                                       vOffset.z() * pHat->momentum().z())/pHat->momentum().rho(), 2));
+    }
+#else
+    const HepMC::GenParticle* pHat { nullptr };
     auto pParticles    = theEvent->particles_begin();
     auto pParticlesEnd = theEvent->particles_end();
-    const HepMC::GenParticle* pHat { nullptr };
     for (; pParticles != pParticlesEnd ; ++pParticles)
     {
         const HepMC::GenParticle* p = *pParticles;
@@ -45,7 +62,6 @@ StatusCode GenEventReadAlg::execute()
         m_cosThetaHist->Fill(-p->momentum().y()/p->momentum().rho());
         m_phiHist->Fill(atan2(p->momentum().x(), p->momentum().z()));
     }
-
     auto pVertices    = theEvent->vertices_begin();
     auto pVerticesEnd = theEvent->vertices_end();
     for (; pVertices != pVerticesEnd; ++pVertices)
@@ -57,6 +73,7 @@ StatusCode GenEventReadAlg::execute()
                                                        vOffset.y() * pHat->momentum().y() + 
                                                        vOffset.z() * pHat->momentum().z())/pHat->momentum().rho(), 2));
     }
+#endif
 
     return StatusCode::SUCCESS;
 }
diff --git a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
index 531e74c5a0dac4b55899f05d953f4021ddbd3694..64b67feb7dcbc51beaa4c7dd2fddca179e340de9 100644
--- a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
+++ b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamAuxCnv.cxx
@@ -257,7 +257,7 @@ StatusCode EventInfoByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr, DataObjec
 
   // record EventInfo
   evtInfo.setEventFlags(xAOD::EventInfo::Core, m_robDataProvider->getEventStatus());
-  pObj = StoreGateSvc::asStorable(pEvtInfoAux);
+  pObj = SG::asStorable(pEvtInfoAux);
 
   ATH_MSG_DEBUG(" New xAOD::EventAuxInfo made, run/event= " << runNumber 
 		<< "/" << eventNumber
diff --git a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
index 29feaa2772fdcf53e3a5412ce6c5a67672285a3b..10d950d5c122887d471b695b1e44eca14b322caf 100644
--- a/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
+++ b/Event/FaserByteStreamCnvSvc/src/EventInfoByteStreamxAODCnv.cxx
@@ -67,7 +67,7 @@ StatusCode EventInfoByteStreamxAODCnv::createObj(IOpaqueAddress* pAddr, DataObje
   xAOD::EventInfo* pEvtInfo = new xAOD::EventInfo();
   DataLink<xAOD::EventAuxInfo> link(nmAux);
   pEvtInfo->setStore(link);
-  pObj = StoreGateSvc::asStorable(pEvtInfo);
+  pObj = SG::asStorable(pEvtInfo);
 
   ATH_MSG_DEBUG(" New xAOD::EventInfo made, run/event= " << pEvtInfo->runNumber() << "/" << pEvtInfo->eventNumber());
 
diff --git a/MagneticField/MagFieldElements/CMakeLists.txt b/MagneticField/MagFieldElements/CMakeLists.txt
index 9bd3b356043c65502eb797dc0b6a6460caebaccd..2676060f7905241caef89938c7c379a5abb443af 100644
--- a/MagneticField/MagFieldElements/CMakeLists.txt
+++ b/MagneticField/MagFieldElements/CMakeLists.txt
@@ -17,5 +17,6 @@ atlas_add_library( MagFieldElements
                    PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} PathResolver)
 
 # Install files from the package:
-atlas_install_headers( MagFieldElements )
+# obsolete
+# atlas_install_headers( MagFieldElements )
 
diff --git a/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx b/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
index fc8cde7bd24f255492857b9014fab544cdaf4871..ab12a060044db4e98b75c1f293d66155fe43b74b 100644
--- a/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
+++ b/Neutrino/NeutrinoDetDescrCnv/NeutrinoIdCnv/src/EmulsionIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ EmulsionIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_emulsionId);
+    pObj = SG::asStorable(m_emulsionId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt b/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
index ecaa1b03b499ec9cc9e9029867f9d34f326c1d58..87cd41fea2e780de98e3d6ab0344ecfd29699cd4 100644
--- a/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
+++ b/Neutrino/NeutrinoEventCnv/NeutrinoSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( NeutrinoSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel NeutrinoSimEventTPCnv NeutrinoSimEvent )
 
 # Install files from the package:
-atlas_install_headers( NeutrinoSimEventAthenaPool )
-#atlas_install_joboptions( share/*.py )
+# atlas_install_headers( NeutrinoSimEventAthenaPool )
+# atlas_install_joboptions( share/*.py )
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
index 2840f5bcfe85fdcd1431227d7168038fff41f407..598d7b3631ac3dbd9145f5a694f88c79bdc1e3a8 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/PreshowerIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ PreshowerIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_preshowerId);
+    pObj = SG::asStorable(m_preshowerId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
index 17a737dd692f7cfbad35a820efd0475b95f8685b..2bda625d37a9d654325ee9f0f0444ec7a789d670 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/TriggerIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ TriggerIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_triggerId);
+    pObj = SG::asStorable(m_triggerId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
index 0b8ab07222746d130a5750a35b0eec75d411fbcc..72a6c68a534b2fa16891da5f8ce567e94c18b72e 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ VetoIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_vetoId);
+    pObj = SG::asStorable(m_vetoId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
index 82d3ab337ed23e70f62dd97bd5be675c656d7244..301b88ed0e6ba28c3bce43151c797455e61d71dd 100644
--- a/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
+++ b/Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
@@ -208,7 +208,7 @@ VetoNuIDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_vetonuId);
+    pObj = SG::asStorable(m_vetonuId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt b/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
index 8983143e65825dd08eae89f240424e62ee0979e0..707291c9ce1248e2158b4d65df5b500f2cca7a8c 100644
--- a/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
+++ b/Scintillator/ScintEventCnv/ScintSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( ScintSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel ScintSimEventTPCnv ScintSimEvent )
 
 # Install files from the package:
-atlas_install_headers( ScintSimEventAthenaPool )
-#atlas_install_joboptions( share/*.py )
+# atlas_install_headers( ScintSimEventAthenaPool )
+# atlas_install_joboptions( share/*.py )
 
diff --git a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
index 5fa0ad816eefc6dfee141cf9620b06593094a0d9..144e514fbf8624a03538f6c2b82a4aae9cea8fed 100644
--- a/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
+++ b/Tracker/TrackerAlignTools/TrackerAlignGenTools/CMakeLists.txt
@@ -23,5 +23,6 @@ atlas_add_component( TrackerAlignGenTools
                      LINK_LIBRARIES TrackerAlignGenToolsLib )
 
 # Install files from the package:
-atlas_install_headers( TrackerAlignGenTools )
+# obsolete
+# atlas_install_headers( TrackerAlignGenTools )
 
diff --git a/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx b/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
index 95447c9126adddf89da6c577fc9692ebb50c5714..d086c0b0e20c5d4d6c7524cfb52f9719d0518fd3 100644
--- a/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
+++ b/Tracker/TrackerDetDescrCnv/TrackerIdCnv/src/FaserSCT_IDDetDescrCnv.cxx
@@ -211,7 +211,7 @@ FaserSCT_IDDetDescrCnv::createObj(IOpaqueAddress* pAddr, DataObject*& pObj)
     }
 
     // Pass a pointer to the container to the Persistency service by reference.
-    pObj = StoreGateSvc::asStorable(m_sctId);
+    pObj = SG::asStorable(m_sctId);
 
     return StatusCode::SUCCESS; 
 
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt b/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
index 417ffa67ae980fc9067d71b5132b6d37126f657d..f6dd2274c769b27efe1440e3c82b85013bb52ec0 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_add_component( FaserSCT_Digitization
 #                ENVIRONMENT THREADS=10 )
 
 # Install files from the package:
-atlas_install_headers( FaserSCT_Digitization )
+# atlas_install_headers( FaserSCT_Digitization )
 atlas_install_python_modules( python/*.py )
 #atlas_install_joboptions( share/*.py )
 atlas_install_scripts( test/FaserSCT_DigitizationDbg.py )
diff --git a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
index 87b41d357f9aeeae0a538a1601109cafa103a7fa..cf057e82c373c350bce15a7d37fd38206f703a65 100644
--- a/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
+++ b/Tracker/TrackerEventCnv/TrackerEventAthenaPool/CMakeLists.txt
@@ -65,7 +65,7 @@ atlas_add_dictionary( TrackerEventAthenaPoolCnvDict
 #    LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
 
 # Install files from the package:
-atlas_install_headers( TrackerEventAthenaPool )
+# atlas_install_headers( TrackerEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
 # Set up (a) test(s) for the converter(s):
diff --git a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
index c5718df7b2f36738bd4f1641200125d1f0c9145b..5b9019ea421aac9d18c3d10aed003099597f9007 100644
--- a/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
+++ b/Tracker/TrackerEventCnv/TrackerSimEventAthenaPool/CMakeLists.txt
@@ -22,6 +22,6 @@ atlas_add_dictionary( TrackerSimEventAthenaPoolCnvDict
                       LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib AthenaPoolUtilities AtlasSealCLHEP GaudiKernel TrackerSimEventTPCnv TrackerSimEvent )
 
 # Install files from the package:
-atlas_install_headers( TrackerSimEventAthenaPool )
+# atlas_install_headers( TrackerSimEventAthenaPool )
 #atlas_install_joboptions( share/*.py )
 
diff --git a/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt b/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
index a275b9a8fde7e1848952b92b8a73885b38deab22..3e96f34af8e96f760805bc119eae3120895f0dc2 100644
--- a/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
+++ b/Tracker/TrkDetAlgs/TrkDetStripClusterImporter/CMakeLists.txt
@@ -21,4 +21,4 @@ atlas_add_component( TrkDetStripClusterImporter
                      AthenaBaseComps xAODFaserTracking GaudiKernel AthenaKernel 
 )
 # Install files from the package:
-atlas_install_headers( TrkDetStripClusterImporter )
\ No newline at end of file
+# atlas_install_headers( TrkDetStripClusterImporter )
\ No newline at end of file
diff --git a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
index 58c40ebec78ecb3ab4585b9dc744392c4aa19042..a98e94027bc5473f8124f2ee1ad7a029b8bba600 100755
--- a/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsGeometry/CMakeLists.txt
@@ -82,7 +82,7 @@ atlas_add_component( FaserActsGeometry
 )
 
 # Install files from the package:
-atlas_install_headers( FaserActsGeometry )
+# atlas_install_headers( FaserActsGeometry )
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/*.py )
 
diff --git a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
index 143f819de580f72b2d390e78390a90e10bd28cb5..5e3263443e5fcc16a864ec219956b516f1dd32a9 100755
--- a/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
+++ b/Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
@@ -142,6 +142,6 @@ atlas_add_component(FaserActsKalmanFilter
 )
 
 # Install files from the package:
-atlas_install_headers(FaserActsKalmanFilter)
+# atlas_install_headers(FaserActsKalmanFilter)
 atlas_install_python_modules( python/*.py )
 atlas_install_scripts( test/*.py )
diff --git a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
index 942c0c70047a71a23e1a3c5dc0ec96ef1d03de1a..fbd60fce7e68e6c523ca2a26a745159994e4c91a 100644
--- a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
+++ b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamAuxCnv.cxx
@@ -100,7 +100,7 @@ StatusCode FaserTriggerByteStreamAuxCnv::createObj(IOpaqueAddress* pAddr, DataOb
 
   CHECK( m_tool->convert(re, &triggerData) );
 
-  pObj = StoreGateSvc::asStorable(pTriggerDataAux);
+  pObj = SG::asStorable(pTriggerDataAux);
 
   ATH_MSG_DEBUG("Created xAOD::FaserTriggerDataAux for run/event =" << runNumber << " / " << eventNumber);
   return StatusCode::SUCCESS;
diff --git a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
index 293992772b39d6d363622cb13408805b244a96e2..77a185f688a4a00a1e6e8e4dabffd14e6fd3ceb5 100644
--- a/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
+++ b/Trigger/FaserTrigEventCnv/FaserTriggerByteStream/src/FaserTriggerByteStreamCnv.cxx
@@ -66,7 +66,7 @@ StatusCode FaserTriggerByteStreamCnv::createObj(IOpaqueAddress* pAddr, DataObjec
   xAOD::FaserTriggerData* pTriggerData = new xAOD::FaserTriggerData();
   DataLink<xAOD::FaserTriggerDataAux> link(nmAux);
   pTriggerData->setStore(link);
-  pObj = StoreGateSvc::asStorable(pTriggerData);
+  pObj = SG::asStorable(pTriggerData);
 
   ATH_MSG_DEBUG("New FaserTriggerData made");
 
diff --git a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
index 864bc5da67d738edd0ec9e9d6a89ee83156c9fad..db8532180b9369bee916499d6d02a233a96c9008 100644
--- a/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
+++ b/Waveform/WaveEventCnv/WaveEventAthenaPool/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_add_dictionary( WaveEventAthenaPoolCnvDict
    LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
 
 # Install files from the package:
-atlas_install_headers( WaveEventAthenaPool )
+# atlas_install_headers( WaveEventAthenaPool )
 
 
 
diff --git a/package_filters.txt b/package_filters.txt
index 02a9f09fe1ab88d93eae0c27e1aa70761e942b16..f77c2958a374546db683266f135939b5195426fe 100644
--- a/package_filters.txt
+++ b/package_filters.txt
@@ -1,23 +1,51 @@
 
++Calorimeter/CaloRecTools
 -Calorimeter/.*
++Control/CalypsoExample/GenEventExample
 -Control/.*
 +Database/ConnectionManagement/FaserAuthentication
+#+Derivation/DerivationAlgs
+#+Derivation/DerivationTools
 -Derivation/.*
++DetectorDescription/DetDescrCnvSvc
 +DetectorDescription/FaserDetDescr
++DetectorDescription/GeoModel/GeoModelInterfaces
 -DetectorDescription/.*
++Event/FaserByteStreamCnvSvcBase
+#+Event/FaserByteStreamCnvSvc
++Event/FaserEventStorage
 -Event/.*
 -FaserGeometryCommon/.*
 -Generators/.*
++LHCData/LHCDataTools
 -LHCData/.*
++MagneticField/MagFieldElements
 -MagneticField/.*
 -Monitoring
 -Neutrino/.*
 -PhysicsAnalysis/.*
 -Scintillator/.*
+#+Simulation/G4Extensions/Pythia8Decayer
+#+Simulation/G4Faser/G4FaserAlg
+#+Simulation/G4Utilities/Geo2G4
++Simulation/ISF/ISF_Core/FaserISF_Interfaces
++Simulation/ISF/ISF_HepMC/FaserISF_HepMC_Interfaces
 -Simulation/.*
+#+Tracker/TrackerAlignTools/TrackerAlignGenTools
++Tracker/TrackerConditions/FaserSCT_ConditionsData
+#+Tracker/TrackerConditions/FaserSiPropertiesTool
++Tracker/TrackerRawEvent/TrackerSimData
+#+Tracker/TrackerRecTools/FaserSiClusterizationTool
 -Tracker/.*
 -Tracking/.*
 -Trigger/.*
+#+Waveform/WaveDigiTools
+#+Waveform/WaveRecTools
 -Waveform/.*
++graphics/VTI12/VTI12Gui
 -graphics/.*
++xAOD/xAODFaserBase
++xAOD/xAODFaserLHC
++xAOD/xAODFaserTrigger
++xAOD/xAODFaserWaveform
 -xAOD/.*
diff --git a/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx b/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
index ac68351c837d85384b4bec718e4f3ca6de8853b4..4447ac451e50480f0fa2a246adf0a922ce819a51 100644
--- a/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
+++ b/xAOD/xAODFaserTrigger/Root/FaserTriggerData_v1.cxx
@@ -9,6 +9,7 @@
 
 // Local include(s):
 #include "xAODFaserTrigger/versions/FaserTriggerData_v1.h"
+#include <bitset>
 
 namespace xAOD {