diff --git a/src/THcHallCSpectrometer.cxx b/src/THcHallCSpectrometer.cxx
index a34755d4fc1851323a899d5fa68663bc3bd144e4..dc5bfc5d1a081ab4ae5a1dcdbc41a8a8ec43fe48 100644
--- a/src/THcHallCSpectrometer.cxx
+++ b/src/THcHallCSpectrometer.cxx
@@ -313,7 +313,7 @@ Int_t THcHallCSpectrometer::TrackCalc()
 {
   // Additioal track calculations. At present, we only calculate beta here.
 
-  cout << "THcHallCSpectrometer::TrackCalc is called xxxxxxxxxxxxxxxxx" << endl;
+  // cout << "THcHallCSpectrometer::TrackCalc is called xxxxxxxxxxxxxxxxx\n";
 
   TrackEnergies(fTracks);
 
@@ -349,7 +349,7 @@ Int_t THcHallCSpectrometer::TrackEnergies( TClonesArray* Tracks ) {
     }
 
     track->SetEnergy(energy);
-    cout << "track " << itrk << "   energy = " << track->GetEnergy() << endl;
+    // cout << "track " << itrk << "   energy = " << track->GetEnergy() << endl;
   }
 
   return ntrack;
diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index 6de4c5cfdbc03d19e24cd2a64b7f30ae247091aa..3f0fcedca732db002004b8137332ec9bca31c527 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -949,14 +949,14 @@ Float_t THcShower::GetShEnergy(THaTrack* Track) {
       cout << " no matched cluster found" << endl;
   }
 
-  // Get matched cluster.
-  THcShowerCluster* cluster = (*fClusterList).ListedCluster(mclust);
-
   // Coordinate corrected total energy deposition in the cluster.
 
   Float_t Etrk = 0.;
   if (mclust >= 0) {         // if there is a matched cluster
 
+    // Get matched cluster.
+    THcShowerCluster* cluster = (*fClusterList).ListedCluster(mclust);
+
     // Correct track energy depositions for the impact coordinate.
 
     for (Int_t ip=0; ip<fNLayers; ip++) {
diff --git a/src/THcShowerHit.h b/src/THcShowerHit.h
index d526cca6c54d5d7c1a3ff2d3ad3fed19095b7b1a..5874bdb2255f8f024f58c7ee0352b128b946ab3a 100644
--- a/src/THcShowerHit.h
+++ b/src/THcShowerHit.h
@@ -6,6 +6,7 @@
 #include <vector>
 #include <iterator>
 #include <iostream>
+#include <memory>
 
 using namespace std;
 
@@ -96,4 +97,6 @@ public:
 typedef vector<THcShowerHit*> THcShowerHitList;
 typedef THcShowerHitList::iterator THcShowerHitIt;
 
+//typedef vector< std::auto_ptr<THcShowerHit> > THcShowerHitList;
+
 #endif