diff --git a/evio/src/main/java/org/hps/evio/RfFitterDriver.java b/evio/src/main/java/org/hps/evio/RfFitterDriver.java
index ef2e5ab02a..6f2e06ac20 100644
--- a/evio/src/main/java/org/hps/evio/RfFitterDriver.java
+++ b/evio/src/main/java/org/hps/evio/RfFitterDriver.java
@@ -128,7 +128,7 @@ private double fitPulse(FADCGenericHit hit) {
         double pedVal[] = {-999, -999};
 
         // Look for bins containing the peaks (2-3 peaks)
-        for (int ii = 4; ii < adcSamples.length; ii++) {
+        for (int ii = 4; ii < adcSamples.length-1; ii++) {
             // After 2 peaks, stop looking for more
             if (iz == 2) {
                 break;
@@ -143,8 +143,16 @@ private double fitPulse(FADCGenericHit hit) {
         }
 
         int jj = 0;
+        int ik = 1;
         // Choose peak closest to center of window (second peak, ik=1)
-        final int ik = 1;
+        if( iz >=2 ) {
+            ik = 1;
+        }else if( iz == 1){
+            ik = 0; // Only one peak found.
+        }else{
+            return 0;
+        }
+        
         pedVal[ik] = (adcSamples[peakBin[ik] - 6] + adcSamples[peakBin[ik] - 7] + adcSamples[peakBin[ik] - 8] + adcSamples[peakBin[ik] - 9]) / 4.0;
         fitThresh[ik] = (adcSamples[peakBin[ik]] + pedVal[ik]) / 3.0;
 
diff --git a/recon/src/main/java/org/hps/recon/skims/FEESkimmer.java b/recon/src/main/java/org/hps/recon/skims/FEESkimmer.java
index 0aca537e18..33b34002d9 100644
--- a/recon/src/main/java/org/hps/recon/skims/FEESkimmer.java
+++ b/recon/src/main/java/org/hps/recon/skims/FEESkimmer.java
@@ -17,7 +17,7 @@ public class FEESkimmer extends Skimmer {
     
     @Override
     public boolean passSelection(EventHeader event){
-	System.out.println(this.getClass().getName()+":: in pass selection"); 
+	// System.out.println(this.getClass().getName()+":: in pass selection");
 	boolean pass=true; 
 	
 	
diff --git a/recon/src/main/java/org/hps/recon/skims/ThreeBodySkimmer.java b/recon/src/main/java/org/hps/recon/skims/ThreeBodySkimmer.java
index 5baff8a2ec..1c72658ea5 100644
--- a/recon/src/main/java/org/hps/recon/skims/ThreeBodySkimmer.java
+++ b/recon/src/main/java/org/hps/recon/skims/ThreeBodySkimmer.java
@@ -17,7 +17,7 @@ public class ThreeBodySkimmer extends Skimmer {
     
     @Override
     public boolean passSelection(EventHeader event){
-	System.out.println(this.getClass().getName()+":: in pass selection"); 
+	// System.out.println(this.getClass().getName()+":: in pass selection");
 	boolean pass=true;