diff --git a/src/THcHitList.h b/src/THcHitList.h
index 3315722653d956e615132d77fe827a99782e819d..186e861a12736d9ee711627c6f0c2c0cc02e1f00 100644
--- a/src/THcHitList.h
+++ b/src/THcHitList.h
@@ -61,6 +61,9 @@ public:
   TClass*       fRawHitClass; // Class of raw hit object to use
   THaDetMap*    fdMap;
 
+  Int_t fNTDCRef_miss;
+  Int_t fNADCRef_miss;
+
 protected:
 
   struct RefIndexMap { // Mapping for one reference channel
@@ -84,8 +87,6 @@ protected:
   Int_t                   fNSB;
   Int_t                   fNPED;
 
-  Int_t fNTDCRef_miss;
-  Int_t fNADCRef_miss;
 
   Decoder::THaCrateMap*                    fMap; /* The Crate map */
   Int_t                                    fTISlot;
diff --git a/src/THcScalerEvtHandler.cxx b/src/THcScalerEvtHandler.cxx
index 808feb51c491dc931c5caeb930675b2270bbd9fe..ea41240c5ceb0bbc0914c84051ff8d7cf7e29678 100644
--- a/src/THcScalerEvtHandler.cxx
+++ b/src/THcScalerEvtHandler.cxx
@@ -201,6 +201,7 @@ Int_t THcScalerEvtHandler::Analyze(THaEvData *evdata)
     EvDump(evdata);
   }
 
+  /// \todo : Put this first event stuff in separte function
   if (lfirst && !fScalerTree) {
 
 
diff --git a/src/THcScalerEvtHandler.h b/src/THcScalerEvtHandler.h
index d22c45bf140e18486868fa8da09e2d206e52823e..0426673c285a4706098f6047dba3cc951c16a0b7 100644
--- a/src/THcScalerEvtHandler.h
+++ b/src/THcScalerEvtHandler.h
@@ -49,7 +49,6 @@ public:
    virtual void SetOnlyBanks(Bool_t b = kFALSE) {fOnlyBanks = b;fRocSet.clear();}
    virtual void SetOnlyUseSyncEvents(Bool_t b=kFALSE) {fOnlySyncEvents = b;}
 
-private:
 
    void AddVars(TString name, TString desc, UInt_t iscal, UInt_t ichan, UInt_t ikind);
    void DefVars();
@@ -91,6 +90,8 @@ private:
    std::set<UInt_t> fRocSet;
    std::set<UInt_t> fModuleSet;
 
+private:
+
    THcScalerEvtHandler(const THcScalerEvtHandler& fh);
    THcScalerEvtHandler& operator=(const THcScalerEvtHandler& fh);