diff --git a/Simulation/HitManagement/HitManagement/AthenaHitsVector.h b/Simulation/HitManagement/HitManagement/AthenaHitsVector.h
index 60cae6cb8dc0ad63648e0ba3ad79036acc2ce803..c4dfee6fa08600ffd6366c23c6c4d7f7e8f72a17 100755
--- a/Simulation/HitManagement/HitManagement/AthenaHitsVector.h
+++ b/Simulation/HitManagement/HitManagement/AthenaHitsVector.h
@@ -55,7 +55,7 @@ public:
     {
       IMessageSvc* msgSvc(Athena::getMessageSvc());
       MsgStream log(msgSvc, "AthenaHitsVector");
-      log << MSG::DEBUG << " initialized." << endreq;
+      log << MSG::DEBUG << " initialized." << endmsg;
       
       m_name = collectionName;
     }
@@ -150,11 +150,14 @@ public:
 
 
 public:
+  // Hide from cling to avoid crash in 6.08.00.  cf. ROOT-8499.
+#ifndef __CLING__
   // Used to ensure that the DVLInfo gets registered
   // when the dictionary for this class is loaded.
   static const std::type_info* initHelper()
   { return DataModel_detail::DVLInfo<AthenaHitsVector<T> >::initHelper(); };
   static const std::type_info* s_info;
+#endif
 };
 
 
@@ -174,10 +177,12 @@ void dvl_makecontainer (size_t nreserve, AthenaHitsVector<T>*& cont)
 }
 
 
+#ifndef __CLING__
 // Ensure that the DVLInfo gets registered
 // when the dictionary for this class is loaded.
 template <class T>
 const std::type_info* AthenaHitsVector<T>::s_info = AthenaHitsVector<T>::initHelper();
+#endif
 
 
 #endif
diff --git a/Simulation/HitManagement/HitManagement/AtlasHitsVector.h b/Simulation/HitManagement/HitManagement/AtlasHitsVector.h
index ae6e5957c0c3a66fb905ea85e498ed8762df7095..64dfda30edfa59d82fb80cb2929e00c57212c310 100755
--- a/Simulation/HitManagement/HitManagement/AtlasHitsVector.h
+++ b/Simulation/HitManagement/HitManagement/AtlasHitsVector.h
@@ -56,7 +56,7 @@ public:
   {
     IMessageSvc* msgSvc(Athena::getMessageSvc());
     MsgStream log(msgSvc, "AtlasHitsVector");
-    log << MSG::DEBUG << " initialized AtlasHitVector " << collectionName << endreq;
+    log << MSG::DEBUG << " initialized AtlasHitVector " << collectionName << endmsg;
 
     m_name = collectionName;
     m_hitvector.reserve(mySize);
@@ -163,11 +163,14 @@ protected:
 
 
 public:
+  // Hide from cling to avoid crash in 6.08.00.  cf. ROOT-8499.
+#ifndef __CLING__
   // Used to ensure that the DVLInfo gets registered
   // when the dictionary for this class is loaded.
   static const std::type_info* initHelper()
   { return DataModel_detail::DVLInfo<AtlasHitsVector<T> >::initHelper(); }
   static const std::type_info* s_info;
+#endif
 };
 
 
@@ -186,10 +189,12 @@ void dvl_makecontainer (size_t nreserve, AtlasHitsVector<T>*& cont)
 }
 
 
+#ifndef __CLING__
 // Ensure that the DVLInfo gets registered
 // when the dictionary for this class is loaded.
 template <class T>
 const std::type_info* AtlasHitsVector<T>::s_info = AtlasHitsVector<T>::initHelper();
+#endif
 
 
 #endif