diff --git a/DDCore/include/DD4hep/Conditions.h b/DDCore/include/DD4hep/Conditions.h
index dac48298674781c8873fc296420a8309e2d9e61e..93b04fb27ac06fd2d0418a8e23f20c59d60d764c 100644
--- a/DDCore/include/DD4hep/Conditions.h
+++ b/DDCore/include/DD4hep/Conditions.h
@@ -89,10 +89,10 @@ namespace DD4hep {
 
       /// Initializing constructor
       explicit IOV(const IOVType* typ);
-      /// Copy constructor
-      explicit IOV(const IOV& copy);
-      /// Copy constructor
+      /// Specialized copy constructor
       explicit IOV(const IOVType* typ, const Key& key);
+      /// Copy constructor
+      IOV(const IOV& copy);
 
       /// Standard Destructor
       ~IOV();
diff --git a/DDCore/include/DD4hep/Dictionary.h b/DDCore/include/DD4hep/Dictionary.h
index 7ea791c3f033039a8e5b1129e5b61865a017bd3f..6956a45e4e543e053a8922a15a4dc1e4c6985b85 100644
--- a/DDCore/include/DD4hep/Dictionary.h
+++ b/DDCore/include/DD4hep/Dictionary.h
@@ -20,17 +20,18 @@
 #define DD4HEP_GEOMETRY_DICTIONARY_H
 
 #include "XML/Evaluator.h"
-#include "DD4hep/World.h"
-#include "DD4hep/Callback.h"
-#include "DD4hep/LCDDData.h"
-#include "DD4hep/Conditions.h"
-#include "DD4hep/FieldTypes.h"
 #include "DD4hep/DD4hepRootPersistency.h"
 #include "DD4hep/objects/ObjectsInterna.h"
 #include "DD4hep/objects/DetectorInterna.h"
 #include "DD4hep/objects/ConditionsInterna.h"
 #include "DD4hep/objects/VolumeManagerInterna.h"
 
+#include "DD4hep/World.h"
+#include "DD4hep/Callback.h"
+#include "DD4hep/LCDDData.h"
+#include "DD4hep/Conditions.h"
+#include "DD4hep/FieldTypes.h"
+
 #include <vector>
 #include <map>
 #include <string>
@@ -181,10 +182,13 @@ template class DD4hep::Handle<TNamed>;
 #pragma link C++ class DD4hep::Handle<DD4hep::Geometry::SegmentationObject>+;
 #pragma link C++ class DD4hep::Geometry::HitCollection+;
 #pragma link C++ class DD4hep::Geometry::Readout+;
+#pragma link C++ class DD4hep::Geometry::HitCollection+;
 #pragma link C++ class DD4hep::Geometry::ReadoutObject+;
 #pragma link C++ class DD4hep::Handle<DD4hep::Geometry::ReadoutObject>+;
 #pragma link C++ class vector<DD4hep::Geometry::HitCollection>+;
 #pragma link C++ class vector<DD4hep::Geometry::Readout>+;
+#pragma link C++ class vector<DD4hep::Geometry::HitCollection*>+;
+#pragma link C++ class vector<const DD4hep::Geometry::HitCollection*>+;
 #pragma link C++ class vector<DD4hep::Geometry::IDDescriptor>+;
 
 #pragma link C++ class DD4hep::Geometry::Alignment+;
diff --git a/DDCore/include/DD4hep/Readout.h b/DDCore/include/DD4hep/Readout.h
index 556fd57314804913487551e3b8a7afac14dd91a9..d51eb9a1c737d6f2842542912bbdee9cce723253 100644
--- a/DDCore/include/DD4hep/Readout.h
+++ b/DDCore/include/DD4hep/Readout.h
@@ -79,8 +79,10 @@ namespace DD4hep {
       }
       /// Access explicit names of hit collections if present
       std::vector<std::string> collectionNames()  const;
+#ifndef __CINT__
       /// Access hit collections if present
       std::vector<const HitCollection*> collections()  const;
+#endif
       /// Access number of hit collections
       size_t numCollections() const;
       /// Assign IDDescription to readout structure