diff --git a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
index 385e0b37ff92a58daa9e5592ae703b2ec217a80f..48ec2674400c5184cf2031dac1ec73e5e2d9cf28 100644
--- a/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
+++ b/Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py
@@ -33,8 +33,8 @@ if __name__ == "__main__":
     ConfigFlags.Input.isMC = False                               # Needed to bypass autoconfig
     ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"          # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
     ConfigFlags.IOVDb.DatabaseInstance = "OFLP200"               # Use MC conditions for now
-    ConfigFlags.GeoModel.FaserVersion     = "FASER-CR"           # Default FASER geometry
-    ConfigFlags.Input.ProjectName = "data20"
+    ConfigFlags.GeoModel.FaserVersion     = "FASER-CR"           # FASER cosmic ray geometry (station 2 only)
+    ConfigFlags.Input.ProjectName = "data20"                     # Needed to bypass autoconfig
     ConfigFlags.GeoModel.Align.Dynamic    = False
     ConfigFlags.Input.Files = ["cosmics.raw"]
     ConfigFlags.Output.RDOFileName = "tracker.RDO.pool.root"
diff --git a/Tracker/TrackerEventCnv/TrackerByteStream/python/TrackerByteStreamConfig.py b/Tracker/TrackerEventCnv/TrackerByteStream/python/TrackerByteStreamConfig.py
index 0d8aa1f604a48f1c506b16955d96bd34327ff8ed..06e029772acd553a6791869ab62dcedbad321bff 100644
--- a/Tracker/TrackerEventCnv/TrackerByteStream/python/TrackerByteStreamConfig.py
+++ b/Tracker/TrackerEventCnv/TrackerByteStream/python/TrackerByteStreamConfig.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-from AthenaConfiguration.ComponentFactory import CompFactory
+#from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 
 def TrackerByteStreamCfg(configFlags, **kwargs):
diff --git a/Tracker/TrackerRecEvent/TrackerPrepRawData/TrackerPrepRawData/TrackerCluster.h b/Tracker/TrackerRecEvent/TrackerPrepRawData/TrackerPrepRawData/TrackerCluster.h
index e32a80e88a6ad8f5194350bb2d8176add6715f42..75f3a09f89b70743cd00a5fe620d27ef99866607 100755
--- a/Tracker/TrackerRecEvent/TrackerPrepRawData/TrackerPrepRawData/TrackerCluster.h
+++ b/Tracker/TrackerRecEvent/TrackerPrepRawData/TrackerPrepRawData/TrackerCluster.h
@@ -95,15 +95,15 @@ namespace Tracker
 		
 		/** return the detector element corresponding to this PRD
 		The pointer will be zero if the det el is not defined (i.e. it was not passed in by the ctor)*/
-		virtual const TrackerDD::SiDetectorElement* detectorElement() const;
+		virtual const TrackerDD::SiDetectorElement* detectorElement() const override;
 
 		/** Interface method checking the type*/
-		virtual bool type(Trk::PrepRawDataType::Type type) const override final;
+		virtual bool type(Trk::PrepRawDataType::Type type) const final;
 
 		/** dump information about the SiCluster*/
-		virtual MsgStream&    dump( MsgStream&    stream) const;
+		virtual MsgStream&    dump( MsgStream&    stream) const override;
 		/** dump information about the SiCluster*/
-		virtual std::ostream& dump( std::ostream& stream) const;
+		virtual std::ostream& dump( std::ostream& stream) const override;
 
 		private:
 		FaserSiWidth m_width; //col, row, and width in mm