diff --git a/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h b/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h
index 786f76d0647f3..d5716b2162426 100644
--- a/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h
+++ b/RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h
@@ -296,7 +296,7 @@ inline double distance(const Hexel &pt1, const Hexel &pt2) {   //2-d distance on
 }
 double calculateLocalDensity(std::vector<KDNode> &, KDTree &, const unsigned int);   //return max density
 double calculateDistanceToHigher(std::vector<KDNode> &, KDTree &);
-int findAndAssignClusters(std::vector<KDNode> &, KDTree &, double, KDTreeBox &, const int);
+int findAndAssignClusters(std::vector<KDNode> &, KDTree &, double, KDTreeBox &, const unsigned int);
 math::XYZPoint calculatePosition(std::vector<KDNode> &);
 
 // attempt to find subclusters within a given set of hexels
diff --git a/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc b/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc
index d9835013186b7..db9bed45664e4 100644
--- a/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc
+++ b/RecoLocalCalo/HGCalRecAlgos/src/HGCalImagingAlgo.cc
@@ -248,7 +248,7 @@ double HGCalImagingAlgo::calculateDistanceToHigher(std::vector<KDNode> &nd, KDTr
   return maxdensity;
 }
 
-int HGCalImagingAlgo::findAndAssignClusters(std::vector<KDNode> &nd,KDTree &lp, double maxdensity, KDTreeBox &bounds, const int layer){
+int HGCalImagingAlgo::findAndAssignClusters(std::vector<KDNode> &nd,KDTree &lp, double maxdensity, KDTreeBox &bounds, const unsigned int layer){
 
   //this is called once per layer...
   //so when filling the cluster temporary vector of Hexels we resize each time by the number
@@ -256,8 +256,8 @@ int HGCalImagingAlgo::findAndAssignClusters(std::vector<KDNode> &nd,KDTree &lp,
 
   unsigned int clusterIndex = 0;
   float delta_c = 9999.;
-  if( layer<=28 ) delta_c = vecDeltas[0];
-  else if( layer<=40 ) delta_c = vecDeltas[1];
+  if( layer<=lastLayerEE ) delta_c = vecDeltas[0];
+  else if( layer<=lastLayerFH ) delta_c = vecDeltas[1];
   else delta_c = vecDeltas[2];
 
   std::vector<size_t> rs = sorted_indices(nd); // indices sorted by decreasing rho
diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalClusterTestProducer.cc b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalClusterTestProducer.cc
index a2e0539fe9296..7fe390050f0dd 100644
--- a/RecoLocalCalo/HGCalRecProducers/plugins/HGCalClusterTestProducer.cc
+++ b/RecoLocalCalo/HGCalRecProducers/plugins/HGCalClusterTestProducer.cc
@@ -18,7 +18,6 @@
 
 #include <memory>
 #include <chrono>
-#include <iostream>
 
 #include "RecoLocalCalo/HGCalRecAlgos/interface/HGCalImagingAlgo.h"
 #include "RecoLocalCalo/HGCalRecAlgos/interface/HGCalDepthPreClusterer.h"