diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
index 938bbc42bbf9524c00baca823c1433944ec207bf..86faaa912f1fb0fe9e14505256695a1ce57fa173 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/MuonTrackPerformance/MuonTrackStatisticsTool.h
@@ -126,8 +126,8 @@ private:
 	
 	bool                m_doTruth;
 	MsgStream*          m_log;
-	bool                m_debug;
-	bool                m_verbose;
+	//bool                m_debug;
+	//bool                m_verbose;
 	
 	mutable std::vector<MuonTrackStatisticsTool::TrackCounters* > m_allCounters;
 	mutable std::vector<MuonTrackStatisticsTool::TruthTrackCounters* > m_allTruthCounters;
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
index f612927bfe26e41b1af9e2f66729c77d94dab9c1..da76a87258401dc12515679ad73ce271a75422c1 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.cxx
@@ -34,7 +34,7 @@ MuonPerformanceAlg::MuonPerformanceAlg(const std::string& name, ISvcLocator* pSv
   m_writeToFile (false),
   m_nevents(0),
   m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"),
-  m_storeGate(NULL),
+  //m_storeGate(NULL),
   m_eventInfo(NULL), 
   m_runNumber(0),
   m_eventNumber(0)
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
index 9bbd76a40207d8a8df8db05bdb72e3db3e54a58a..c19725e0a44459613dde59078092cf6b05f9e649 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonPerformanceAlg.h
@@ -64,7 +64,7 @@ class MuonPerformanceAlg : public AthAlgorithm {
   std::vector<int>                m_nreco10;
 
   ToolHandle<Muon::MuonEDMPrinterTool> m_printer;
-  StoreGateSvc*       m_storeGate;
+  //StoreGateSvc*       m_storeGate;
   const xAOD::EventInfo*    m_eventInfo; 
 
   int m_runNumber;
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
index 54b72af85b4d93fca8c799e850d921e8898e3cf4..54eb3dcd28e82443a7c91233ce91a6bda87a3bc0 100644
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonRecoValidationTool.h
@@ -41,7 +41,7 @@ namespace Muon {
   class IMuonHitTimingTool;
   class MuonSegment;
   class MuonClusterOnTrack;
-  class MuonCandidate;
+  struct MuonCandidate;
 
   class MuonRecoValidationTool : public IMuonRecoValidationTool, virtual public IIncidentListener, public AthAlgTool  {
   public:
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
index 878fb4b1f1dc6b7940e2123f8d12a07427cb3878..46583e5d5a9a3a35e85f7b44879b2d0be77aef6d 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonTrackPerformance/src/MuonTrackPerformanceAlg.cxx
@@ -144,7 +144,7 @@ bool MuonTrackPerformanceAlg::handleSegmentCombinations() {
   StatusCode sc = evtStore()->retrieve(combiCol,m_segmentCombiLocation);
   if (sc.isFailure() ) {
     *m_log << MSG::WARNING << " Could not find MuonSegmentCombinationCollection at " << m_segmentCombiLocation <<endmsg;
-    return StatusCode::RECOVERABLE;
+    return true;
   }else{
     if( m_debug ) *m_log << MSG::DEBUG << " Retrieved MuonSegmentCombinationCollection "  << combiCol->size() << endmsg;
   }