diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
index c628341b6b908268deb775b9c8b8e66fdfe37fa4..9ff67d0d5ed975ad0078d89700926b09dda213e0 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Clusters.cxx
@@ -230,7 +230,7 @@ StatusCode PixelMainMon::bookClustersMon(void) {
 
     tmp = "Cluster_LVL1A_Mod";
     tmp2 = "Average cluster Level 1 Accept";
-    m_cluster_LVL1A_mod = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D, true));
+    m_cluster_LVL1A_mod = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D));
     sc = m_cluster_LVL1A_mod->regHist(timeShift);
 
     tmp = "Clus_Occ_SizeCut";
@@ -240,7 +240,7 @@ StatusCode PixelMainMon::bookClustersMon(void) {
 
     tmp = "Clus_LVL1A_SizeCut";
     tmp2 = "Average Size>1 Cluster Level 1 Accept";
-    m_clus_LVL1A_sizenot1 = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D, true));
+    m_clus_LVL1A_sizenot1 = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D));
     sc = m_clus_LVL1A_sizenot1->regHist(timeShift);
 
     if (m_doOnline) {
@@ -257,17 +257,17 @@ StatusCode PixelMainMon::bookClustersMon(void) {
     if (!m_doOnline) {
       tmp = "Cluster_Size_Map";
       tmp2 = "Average cluster size map";
-      m_clussize_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D, true));
+      m_clussize_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D));
       sc = m_clussize_map->regHist(clusterExpert);
 
       tmp = "Cluster_Charge_Map";
       tmp2 = "Average cluster charge map";
-      m_cluscharge_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D, true));
+      m_cluscharge_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D));
       sc = m_cluscharge_map->regHist(clusterExpert);
 
       tmp = "Cluster_ToT_Map";
       tmp2 = "Average cluster ToT map";
-      m_clusToT_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D, true));
+      m_clusToT_map = std::make_unique<PixelMon2DProfilesLW>(PixelMon2DProfilesLW(tmp.c_str(), (tmp2 + m_histTitleExt).c_str(), PixMon::HistConf::kPixIBL2D3D));
       sc = m_clusToT_map->regHist(clusterExpert);
     }
   }
@@ -289,32 +289,32 @@ StatusCode PixelMainMon::bookClustersMon(void) {
     if (m_doOnTrack) {
       if (m_doIBL) {
 	hname = makeHistname("Cluster_Occupancy_PP0_IBLA", false);
-	htitles = makeHisttitle("Average per FE cluster occupancy, IBL A-side", ";stave ;average # clusters per FE per event", false);
+	htitles = makeHisttitle("Average per FE cluster occupancy reset every 5 min, IBL A-side", ";stave ;average # clusters per FE per event", false);
 	sc = clusterExpert.regHist(m_cluster_occupancy_PP0_IBLA = TProfile_LW::create(hname.c_str(), htitles.c_str(), 
 									  PixMon::kNumStavesIBL, 0.5, 0.5 + PixMon::kNumStavesIBL));
 	hname = makeHistname("Cluster_Occupancy_PP0_IBLC", false);
-	htitles = makeHisttitle("Average per FE cluster occupancy, IBL C-side", ";stave ;average # clusters per FE per event", false);
+	htitles = makeHisttitle("Average per FE cluster occupancy reset every 5 min, IBL C-side", ";stave ;average # clusters per FE per event", false);
 	sc = clusterExpert.regHist(m_cluster_occupancy_PP0_IBLC = TProfile_LW::create(hname.c_str(), htitles.c_str(), 
 									  PixMon::kNumStavesIBL, 0.5, 0.5 + PixMon::kNumStavesIBL));
       }
       hname = makeHistname("Cluster_Occupancy_PP0_B0", false);
-      htitles = makeHisttitle("Average per module cluster occupancy, B0", ";stave ;average # clusters per module per event", false);
+      htitles = makeHisttitle("Average per module cluster occupancy reset every 5 min, B0", ";stave ;average # clusters per module per event", false);
       sc = clusterExpert.regHist(m_cluster_occupancy_PP0_B0 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								      PixMon::kNumStavesL0, 0.5, 0.5 + PixMon::kNumStavesL0));
       hname = makeHistname("Cluster_Occupancy_PP0_B1", false);
-      htitles = makeHisttitle("Average per module cluster occupancy, B1", ";stave ;average # clusters per module per event", false);
+      htitles = makeHisttitle("Average per module cluster occupancy reset every 5 min, B1", ";stave ;average # clusters per module per event", false);
       sc = clusterExpert.regHist(m_cluster_occupancy_PP0_B1 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								      PixMon::kNumStavesL1, 0.5, 0.5 + PixMon::kNumStavesL1));
       hname = makeHistname("Cluster_Occupancy_PP0_B2", false);
-      htitles = makeHisttitle("Average per module cluster occupancy, B2", ";stave ;average # clusters per module per event", false);
+      htitles = makeHisttitle("Average per module cluster occupancy reset every 5 min, B2", ";stave ;average # clusters per module per event", false);
       sc = clusterExpert.regHist(m_cluster_occupancy_PP0_B2 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								      PixMon::kNumStavesL2, 0.5, 0.5 + PixMon::kNumStavesL2));
       hname = makeHistname("Cluster_Occupancy_PP0_ECA", false);
-      htitles = makeHisttitle("Average per module cluster occupancy, ECA", ";sector ;average # clusters per module per event", false);
+      htitles = makeHisttitle("Average per module cluster occupancy reset every 5 min, ECA", ";sector ;average # clusters per module per event", false);
       sc = clusterExpert.regHist(m_cluster_occupancy_PP0_ECA = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								       PixMon::kNumPP0sEC, 0.5, 0.5 + PixMon::kNumPP0sEC));
       hname = makeHistname("Cluster_Occupancy_PP0_ECC", false);
-      htitles = makeHisttitle("Average per module cluster occupancy, ECC", ";sector ;average # clusters per module per event", false);
+      htitles = makeHisttitle("Average per module cluster occupancy reset every 5 min, ECC", ";sector ;average # clusters per module per event", false);
       sc = clusterExpert.regHist(m_cluster_occupancy_PP0_ECC = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								       PixMon::kNumPP0sEC, 0.5, 0.5 + PixMon::kNumPP0sEC));
       formatPP0Histos(m_cluster_occupancy_PP0_ECA, m_cluster_occupancy_PP0_ECC,
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
index 60bed2effceef6fd8a1d5c61adfee4f2fb7efeab..24fed3ee3301e86c5414b2a95f7d3b934dd0bd51 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Hits.cxx
@@ -102,7 +102,7 @@ StatusCode PixelMainMon::bookHitsMon(void) {
     if (m_doOnline) { 
       hname = makeHistname(("AvgOccRatioToIBL_last100lb_" + m_modLabel_PixLayerIBL2D3D[i]), false); // use good modules only
       htitles = makeHisttitle(("Relative occupancy to IBL per event, " + m_modLabel_PixLayerIBL2D3D[i]), ";last 100 lumi blocks;occ. ratio to IBL", false);
-      sc = rdoShift.regHist(m_avgocc_ratio_lastXlb_mod[i] = new TH1F(hname.c_str(), htitles.c_str(), 100, 0, 100));
+      sc = rdoShift.regHist(m_avgocc_ratio_lastXlb_mod[i] = new TH1F(hname.c_str(), htitles.c_str(), 100, 0.5, 100.5));
     }
 
     hname = makeHistname(("nHits_per_module_per_event_" + m_modLabel_PixLayerIBL2D3D[i]), false);
@@ -190,32 +190,32 @@ StatusCode PixelMainMon::bookHitsMon(void) {
     }
     if (m_doIBL) {
       hname = makeHistname("Occupancy_PP0_IBLA", false);
-      htitles = makeHisttitle("Average per FE occupancy, IBL A-side", ";stave ;average # hits per FE per event", false);
+      htitles = makeHisttitle("Average per FE occupancy reset every 5 min, IBL A-side", ";stave ;average # hits per FE per event", false);
       sc = rdoExpert.regHist(m_occupancy_PP0_IBLA = TProfile_LW::create(hname.c_str(), htitles.c_str(), 
 									PixMon::kNumStavesIBL, 0.5, 0.5 + PixMon::kNumStavesIBL));
       hname = makeHistname("Occupancy_PP0_IBLC", false);
-      htitles = makeHisttitle("Average per FE occupancy, IBL C-side", ";stave ;average # hits per FE per event", false);
+      htitles = makeHisttitle("Average per FE occupancy reset every 5 min, IBL C-side", ";stave ;average # hits per FE per event", false);
       sc = rdoExpert.regHist(m_occupancy_PP0_IBLC = TProfile_LW::create(hname.c_str(), htitles.c_str(), 
 									PixMon::kNumStavesIBL, 0.5, 0.5 + PixMon::kNumStavesIBL));
     }
     hname = makeHistname("Occupancy_PP0_B0", false);
-    htitles = makeHisttitle("Average per module occupancy, B0", ";stave ;average # hits per module per event", false);
+    htitles = makeHisttitle("Average per module occupancy reset every 5 min, B0", ";stave ;average # hits per module per event", false);
     sc = rdoExpert.regHist(m_occupancy_PP0_B0 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								    PixMon::kNumStavesL0, 0.5, 0.5 + PixMon::kNumStavesL0));
     hname = makeHistname("Occupancy_PP0_B1", false);
-    htitles = makeHisttitle("Average per module occupancy, B1", ";stave ;average # hits per module per event", false);
+    htitles = makeHisttitle("Average per module occupancy reset every 5 min, B1", ";stave ;average # hits per module per event", false);
     sc = rdoExpert.regHist(m_occupancy_PP0_B1 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								    PixMon::kNumStavesL1, 0.5, 0.5 + PixMon::kNumStavesL1));
     hname = makeHistname("Occupancy_PP0_B2", false);
-    htitles = makeHisttitle("Average per module occupancy, B2", ";stave ;average # hits per module per event", false);
+    htitles = makeHisttitle("Average per module occupancy reset every 5 min, B2", ";stave ;average # hits per module per event", false);
     sc = rdoExpert.regHist(m_occupancy_PP0_B2 = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								    PixMon::kNumStavesL2, 0.5, 0.5 + PixMon::kNumStavesL2));
     hname = makeHistname("Occupancy_PP0_ECA", false);
-    htitles = makeHisttitle("Average per module occupancy, ECA", ";sector ;average # hits per module per event", false);
+    htitles = makeHisttitle("Average per module occupancy reset every 5 min, ECA", ";sector ;average # hits per module per event", false);
     sc = rdoExpert.regHist(m_occupancy_PP0_ECA = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								     PixMon::kNumPP0sEC, 0.5, 0.5 + PixMon::kNumPP0sEC));
     hname = makeHistname("Occupancy_PP0_ECC", false);
-    htitles = makeHisttitle("Average per module occupancy, ECC", ";sector ;average # hits per module per event", false);
+    htitles = makeHisttitle("Average per module occupancy reset every 5 min, ECC", ";sector ;average # hits per module per event", false);
     sc = rdoExpert.regHist(m_occupancy_PP0_ECC = TProfile_LW::create(hname.c_str(), htitles.c_str(),
 								     PixMon::kNumPP0sEC, 0.5, 0.5 + PixMon::kNumPP0sEC));
     formatPP0Histos(m_occupancy_PP0_ECA, m_occupancy_PP0_ECC,
@@ -789,13 +789,13 @@ StatusCode PixelMainMon::procHitsMon(void) {
   }
 
   if (m_doOnline) {
-    unsigned int lastlb = m_manager->lumiBlockNumber()-1; //remove -1 for testing
+    int lastlb = m_manager->lumiBlockNumber()-1; //remove -1 for testing
     double cont(0.0), err(0.0);
     int entr(0);
     for (int i = 0; i < PixLayer::COUNT - 1 + (int)(m_doIBL); i++) {
       if (m_avgocc_per_lumi_mod[i] && m_avgocc_ratio_lastXlb_mod[i]) {
-	unsigned int bing = m_avgocc_per_lumi_mod[i]->GetXaxis()->FindBin(lastlb);
-	unsigned int nXbins = m_avgocc_ratio_lastXlb_mod[i]->GetNbinsX();
+	int bing = m_avgocc_per_lumi_mod[i]->GetXaxis()->FindBin(lastlb);
+	int nXbins = m_avgocc_ratio_lastXlb_mod[i]->GetNbinsX();
 	m_avgocc_ratio_lastXlb_mod[i]->GetXaxis()->Set(nXbins, lastlb-nXbins+0.5, lastlb+0.5);
 	m_avgocc_ratio_lastXlb_mod[i]->Reset();
 	m_avgocc_ratio_lastXlb_mod[i]->Sumw2();
diff --git a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
index cff0aa316759b1f764d3b7c4622dddafda0d2fba..6e4a47af5a97974f6ea007734b339f73bc8e9b53 100644
--- a/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
+++ b/InnerDetector/InDetMonitoring/PixelMonitoring/src/Track.cxx
@@ -180,10 +180,6 @@ StatusCode PixelMainMon::fillTrackMon(void) {
 
       if (!m_idHelper->is_pixel(surfaceID)) continue;
       int pixlayer = getPixLayerID(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_doIBL);
-      int pixlayeribl2d3d = pixlayer;
-      if (pixlayeribl2d3d == PixLayerIBL2D3D::kIBL) {
-        pixlayeribl2d3d = getPixLayerIDIBL2D3D(m_pixelid->barrel_ec(surfaceID), m_pixelid->layer_disk(surfaceID), m_pixelid->eta_module(surfaceID), m_doIBL);
-      }
       if (pixlayer == 99) continue;
 
       float nOutlier = 0.;
@@ -290,14 +286,14 @@ StatusCode PixelMainMon::fillTrackMon(void) {
 
 StatusCode PixelMainMon::procTrackMon(void) {
   if (m_doOnline) {
-    unsigned int lastlb = m_manager->lumiBlockNumber()-1; //remove -1 for testing
+    int lastlb = m_manager->lumiBlockNumber()-1; //remove -1 for testing
     double cont(0.0);
     int entr(0), entries(0);
     for (int i = 0; i < PixLayer::COUNT - 1 + (int)(m_doIBL); i++) {
       if (m_hiteff_incl_mod[i] && m_hiteff_lastXlb_mod[i]) {
-	unsigned int bing = m_hiteff_incl_mod[i]->GetXaxis()->FindBin(lastlb);
+	int bing = m_hiteff_incl_mod[i]->GetXaxis()->FindBin(lastlb);
 
-	unsigned int nXbins = m_hiteff_lastXlb_mod[i]->GetNbinsX();
+	int nXbins = m_hiteff_lastXlb_mod[i]->GetNbinsX();
 	m_hiteff_lastXlb_mod[i]->GetXaxis()->Set(nXbins, lastlb-nXbins+0.5, lastlb+0.5);
 	m_hiteff_lastXlb_mod[i]->Reset();
 
@@ -321,16 +317,16 @@ StatusCode PixelMainMon::procTrackMon(void) {
       }
     }
     if (m_npixhits_per_track_lumi && m_npixhits_per_track_lastXlb) {
-      unsigned int bingx = m_npixhits_per_track_lumi->GetXaxis()->FindBin(lastlb);
-      unsigned int nbingy = m_npixhits_per_track_lumi->GetNbinsY();
+      int bingx = m_npixhits_per_track_lumi->GetXaxis()->FindBin(lastlb);
+      int nbingy = m_npixhits_per_track_lumi->GetNbinsY();
 
-      unsigned int nXbins = m_npixhits_per_track_lastXlb->GetNbinsX();
+      int nXbins = m_npixhits_per_track_lastXlb->GetNbinsX();
       m_npixhits_per_track_lastXlb->GetXaxis()->Set(nXbins, lastlb-nXbins+0.5, lastlb+0.5);
       m_npixhits_per_track_lastXlb->Reset();
 
       for (int binfx=m_npixhits_per_track_lastXlb->GetNbinsX(); binfx>0; binfx--) {
 	if (bingx>0) {
-	  for (unsigned int bingy = 1; bingy <= nbingy; bingy++) {
+	  for (int bingy = 1; bingy <= nbingy; bingy++) {
 	    cont = m_npixhits_per_track_lumi->GetBinContent(bingx, bingy);
 	    if (cont!=0) {
 	      m_npixhits_per_track_lastXlb->SetBinContent(binfx, bingy, cont);