diff --git a/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p0.cxx b/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p0.cxx
index 1866aa6b2ca186590c4c59a3bc8149521e26000a..3417265dcfec378dcae21a7265d5785595a6495b 100644
--- a/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p0.cxx
+++ b/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p0.cxx
@@ -22,10 +22,10 @@ void TrackParticleTruthCollectionCnv_p0::persToTrans( const Rec::TrackParticleTr
                                               TrackParticleTruthCollection* trans, 
                                               MsgStream& msg ) 
 {
-  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::persToTrans(): PERS size = "<<pers->size()<<endreq;
+  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::persToTrans(): PERS size = "<<pers->size()<<endmsg;
 
   if(pers->empty()) {
-    msg<<MSG::WARNING<<"persToTrans(): can't find out the corresponding TrackCollection for the empty TrackParticleTruthCollection_p0 (old-format)"<<endreq;
+    msg<<MSG::WARNING<<"persToTrans(): can't find out the corresponding TrackCollection for the empty TrackParticleTruthCollection_p0 (old-format)"<<endmsg;
   }
   else {
     //static (const) DataLink<Rec::TrackParticleContainer>                 = 
@@ -36,14 +36,14 @@ void TrackParticleTruthCollectionCnv_p0::persToTrans( const Rec::TrackParticleTr
     }
   }
 
-  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::persToTrans() DONE"<<endreq;
+  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::persToTrans() DONE"<<endmsg;
 }
 
 void TrackParticleTruthCollectionCnv_p0::transToPers( const TrackParticleTruthCollection*, 
                                               Rec::TrackParticleTruthCollection_p0* , 
                                               MsgStream& msg ) 
 {
-  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::transToPers()"<<endreq;
+  msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::transToPers()"<<endmsg;
   throw std::runtime_error("TrackParticleTruthCollectionCnv_p0::transToPers() is not implemented, _p1 or later is meant to be used.");
-  //never reached msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::transToPers() DONE"<<endreq;
+  //never reached msg<<MSG::DEBUG<<"TrackParticleTruthCollectionCnv_p0::transToPers() DONE"<<endmsg;
 }
diff --git a/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p1.cxx b/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p1.cxx
index 51a40734f3ffa2b7e098b11532122efa11565516..e2ec6ead6737cad61915be550ce12a83f18b2409 100644
--- a/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p1.cxx
+++ b/Reconstruction/TrackParticleTruthTPCnv/src/TrackParticleTruthCollectionCnv_p1.cxx
@@ -28,7 +28,7 @@ void TrackParticleTruthCollectionCnv_p1::persToTrans( const Rec::TrackParticleTr
 {
     trans->clear();
 
-    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::persToTrans(): PERS size = " << pers->m_entries.size() << endreq;
+    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::persToTrans(): PERS size = " << pers->m_entries.size() << endmsg;
 
     dataLinkConverter.persToTrans(pers->m_trackCollectionLink, TrackParticleTruthCollectionAccessor::trackParticleContainerLink(trans), msg);
 
@@ -40,7 +40,7 @@ void TrackParticleTruthCollectionCnv_p1::persToTrans( const Rec::TrackParticleTr
         trans->insert(trans->end(), std::make_pair(el, TrackParticleTruth(link, i->probability)) );
     }
 
-    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::persToTrans() DONE" << endreq;
+    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::persToTrans() DONE" << endmsg;
 }
 
 void TrackParticleTruthCollectionCnv_p1::transToPers( const TrackParticleTruthCollection* trans, 
@@ -48,8 +48,8 @@ void TrackParticleTruthCollectionCnv_p1::transToPers( const TrackParticleTruthCo
                                                       MsgStream& msg ) 
 {
     if (msg.level() <= MSG::DEBUG) {
-        msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers()" << endreq;
-        msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers(): input size = " << trans->size() << endreq;
+        msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers()" << endmsg;
+        msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers(): input size = " << trans->size() << endmsg;
     }
   
     dataLinkConverter.transToPers(trans->trackParticleContainerLink(), pers->m_trackCollectionLink, msg);
@@ -76,5 +76,5 @@ void TrackParticleTruthCollectionCnv_p1::transToPers( const TrackParticleTruthCo
         }
     }
 
-    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers() DONE" << endreq;
+    if (msg.level() <= MSG::DEBUG) msg << MSG::DEBUG << "TrackParticleTruthCollectionCnv_p1::transToPers() DONE" << endmsg;
 }
diff --git a/Reconstruction/TrackParticleTruthTPCnv/test/TrackParticleTruthCollectionCnv_p1_test.cxx b/Reconstruction/TrackParticleTruthTPCnv/test/TrackParticleTruthCollectionCnv_p1_test.cxx
index 35a677bf2ae2591ed70d8f15e5286080a9596473..85dfda1c536adce4ce4d2cd55b87a35e7a495554 100644
--- a/Reconstruction/TrackParticleTruthTPCnv/test/TrackParticleTruthCollectionCnv_p1_test.cxx
+++ b/Reconstruction/TrackParticleTruthTPCnv/test/TrackParticleTruthCollectionCnv_p1_test.cxx
@@ -16,6 +16,7 @@
 #include "TrackParticleTruthTPCnv/TrackParticleTruthCollection_p1.h"
 #include "ParticleTruth/TrackParticleTruthCollection.h"
 #include "SGTools/TestStore.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -51,6 +52,9 @@ void testit (const TrackParticleTruthCollection& trans1)
 void test1()
 {
   std::cout << "test1\n";
+  // Get proxy created outside of leak checking.
+  DataLink<Rec::TrackParticleContainer> dldum ("tpc");
+  Athena_test::Leakcheck check;
 
   TrackParticleTruthCollection trans1 (DataLink<Rec::TrackParticleContainer>("tpc"));
   for (int i=0; i<10; i++) {