diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
index 11e3dceff948e0a73beae316c85d792a2a4f3fc2..494b9ee4baebd12adba0f3229c1b7073b6a4ffae 100755
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
@@ -1784,8 +1784,7 @@ StatusCode IDAlignMonResiduals::fillHistograms()
 				
 	if(barrelEC==0){//filling pixel barrel histograms
 	  
-	  if (layerDisk==0)
-	    nIBLHitsPerLB++;
+	  if (layerDisk==0) nIBLHitsPerLB++;
 
 	  m_si_b_residualx -> Fill(residualX, TrkWeight);
 	  int m_layerModEtaShift[4] = {10,30,48,65};       //HARDCODED!
@@ -1808,19 +1807,19 @@ StatusCode IDAlignMonResiduals::fillHistograms()
 	  m_pix_b_yresvsmodetaphi_3ds[layerDisk] -> Fill(modEta, modPhi, residualY, TrkWeight);
 
 	  // old Pixel detector (Pixel excluding IBL) 
-	  if (layerDisk != 0) {
+	  if (layerDisk > 0) {
 	    m_oldpix_b_residualx->Fill(residualX, TrkWeight);
 	    m_oldpix_b_residualy->Fill(residualY, TrkWeight);
 	  }
-	  if (layerDisk == 0) {
+	  if (layerDisk == 0) { // IBL has barrel layer = 0 
 	    m_pix_b0_resXvsetaLumiBlock->Fill(float(lumiblock), modEta, residualX, TrkWeight);
 
-	    if (modEta<=5 && modEta>=-6) {
+	    if (modEta<=5 && modEta>=-6) { // IBL planar modules
 	      m_pix_b0_resXvsetaLumiBlock_planars->Fill(float(lumiblock),modEta,residualX,TrkWeight);
 	      m_pix_b0_planars_residualx->Fill(residualX, TrkWeight);
 	      m_pix_b0_planars_residualy->Fill(residualY, TrkWeight);
 	    }
-	    if (modEta < -6 || modEta >=6) {
+	    if (modEta < -6 || modEta >=6) { // IBL 3D modules
 	      m_pix_b0_3D_residualx->Fill(residualX, TrkWeight);
 	      m_pix_b0_3D_residualy->Fill(residualY, TrkWeight);
 	    }
@@ -5351,14 +5350,14 @@ void IDAlignMonResiduals::fillTRTBarrelHistograms(int m_barrel_ec, int m_layer_o
     for(int lay=0; lay<3; ++lay){
       if(lay == m_layer_or_wheel){
 	m_trt_b_hist->lrOverPhiVsStrawLayer[side] -> Fill(numStrawLayers[lay]+m_straw_layer, LRcorrect, TrkWeight);
-	if (m_extendedPlots)               m_trt_b_hist->resVsPhiEta[side][lay]->Fill(trketa,m_phi_module, residualR, TrkWeight);
-	if (m_extendedPlots && hitZ!=-999) m_trt_b_hist->resVsPhiZ[side][lay]  ->Fill(hitZ,  m_phi_module, residualR, TrkWeight);
 	if (m_extendedPlots) {
+	  m_trt_b_hist->resVsPhiEta[side][lay]->Fill(trketa,m_phi_module, residualR, TrkWeight);
 	  for(int m_testPhi=0; m_testPhi < 32; ++m_testPhi ){
 	    if(m_phi_module == m_testPhi)
 	      m_trt_b_hist->aveResVsStrawLayerStackLevel[side][m_testPhi] -> Fill(numStrawLayers[lay]+m_straw_layer, residualR, TrkWeight);
 	  }
-	}
+	  if (hitZ!=-999) m_trt_b_hist->resVsPhiZ[side][lay]  ->Fill(hitZ,  m_phi_module, residualR, TrkWeight);
+	} 
 				
 	for(unsigned int position=0; position<5;++position){
 	  bool doFillPosition = false;
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
index bd20a0409f8958a55fc2c88bb186bc432a5d82a1..e32f4d6c5c97c0521250981811af3f51b842245e 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/InDetPerformanceMonitoring/FourMuonEvent.h
@@ -21,9 +21,7 @@
 #include "xAODEgamma/Electron.h"
 #include "xAODEgamma/ElectronContainer.h"
 
-//-
-#include "AthenaBaseComps/AthAlgorithm.h"
-///==============================================================================
+//==============================================================================
 // Forward class declarations...
 //==============================================================================
 class TrackParticle;