diff --git a/Control/AthenaMonitoring/python/DefineHistogram.py b/Control/AthenaMonitoring/python/DefineHistogram.py
index bb7e2993423696a1fa712ba50de6a238ef09e3e0..7081bef351d82e567edb6d521ee16028f1067f15 100644
--- a/Control/AthenaMonitoring/python/DefineHistogram.py
+++ b/Control/AthenaMonitoring/python/DefineHistogram.py
@@ -1,12 +1,16 @@
+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
+
 def defineHistogram(varname, type='TH1F', path='EXPERT',
                     title='Unspecified_title_for_the_histogram_is_truly_annoying,_because_this_default_is_long;unspecified_label;unspecified_label',
                     xbins=100, xmin=0, xmax=1,
                     ybins=None, ymin=None, ymax=None, zmin=None, zmax=None, opt='', labels=None):
-    """ Generates the histogram definition string which is digestable by TrigGenericMonitoringTool.
+    """ Generates the histogram definition string which is digestable by GenericMonitoringTool.
 
 
-    Note that defaults are compleetly unreasonable. The tile is intentionally made annoying.
-    For histogras types supported and allowed paths have a look at TrigGenericMonitoringTool documentation.
+    Note that defaults are compleetly unreasonable. The title is made annoying intentionally.
+    For histograms types, paths and all the options have a look at GenericMonitoringTool documentation.
     """
     coded = "%s, %s, %s, %s, %d, %f, %f" % (path, type, varname, title, xbins, xmin, xmax)
     if ybins is not None:
diff --git a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
index 48e5d23e4e4ed40a12e5bcafd2fda5c1b492c8a5..913e33b7532315729d31cf2d4386264fadbd3514 100644
--- a/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
+++ b/Trigger/TrigSteer/L1Decoder/python/L1DecoderMonitoring.py
@@ -1,3 +1,6 @@
+#
+#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#
 from AthenaMonitoring.AthenaMonitoringConf import GenericMonitoringTool
 from AthenaMonitoring.DefineHistogram import defineHistogram
 import math
diff --git a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
index deda05bb9f3c0e0a6d3016e4d1739c8a1fff9e86..65d600ca06610b048fe92d8afb7f949f6fbb515f 100644
--- a/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/EMRoIsUnpackingTool.cxx
@@ -126,7 +126,7 @@ StatusCode EMRoIsUnpackingTool::unpack( const EventContext& ctx,
     auto RoIsCount = MonitoredScalar::declare( "count", trigRoIs->size() );
     auto RoIsPhi   = MonitoredCollection::declare( "phi", *trigRoIs.get(), &TrigRoiDescriptor::phi );
     auto RoIsEta   = MonitoredCollection::declare( "eta", *trigRoIs.get(), &TrigRoiDescriptor::eta );
-    auto monitorit = MonitoredScope::declare( m_monTool,  RoIsCount, RoIsEta, RoIsPhi );
+    MonitoredScope::declare( m_monTool,  RoIsCount, RoIsEta, RoIsPhi );
   }
 
   // recording
diff --git a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
index 75b16098f6a530117db8530f806fffa5df2750e1..99b6b241852ef006bfaa85169e824924ef2f74b1 100644
--- a/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
+++ b/Trigger/TrigSteer/L1Decoder/src/MURoIsUnpackingTool.cxx
@@ -112,7 +112,7 @@ StatusCode MURoIsUnpackingTool::unpack( const EventContext& ctx,
     auto RoIsCount = MonitoredScalar::declare( "count", trigRoIs->size() );
     auto RoIsPhi   = MonitoredCollection::declare( "phi", *trigRoIs.get(), &TrigRoiDescriptor::phi );
     auto RoIsEta   = MonitoredCollection::declare( "eta", *trigRoIs.get(), &TrigRoiDescriptor::eta );
-    auto monitorit = MonitoredScope::declare( m_monTool,  RoIsCount, RoIsEta, RoIsPhi );
+    MonitoredScope::declare( m_monTool,  RoIsCount, RoIsEta, RoIsPhi );
   }
   // recording
   {