diff --git a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
index bac247aea3a13c6916d89014166ff174dbfe5a01..11763c8887b8aa989d5d2bdfef6af3845a3736c7 100644
--- a/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
+++ b/Event/xAOD/xAODEventInfoCnv/src/EventInfoCnvTool.cxx
@@ -77,9 +77,10 @@ namespace xAODMaker {
       if( detStore()->contains< AthenaAttributeList >( INDET_BEAMPOS ) ) {
          m_beamCondSvcAvailable = true;
       } else {
-         ATH_MSG_WARNING( "Beam conditions service not available" );
-         ATH_MSG_WARNING( "Will not fill beam spot information into "
-                          "xAOD::EventInfo" );
+         // This is normal in some cases, but tell the user anyway
+         ATH_MSG_INFO( "Beam conditions service not available" );
+         ATH_MSG_INFO( "Will not fill beam spot information into "
+                       "xAOD::EventInfo" );
          m_beamCondSvcAvailable = false;
       }
       if(m_disableBeamSpot){
diff --git a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
index bde8beb00ab826cd7818ae7fef32edf8008f5350..c086a7c36e3a594f5a299cd977c27b39caa2a449 100644
--- a/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
+++ b/PhysicsAnalysis/PrimaryDPDMaker/python/PrimaryDPDFlags.py
@@ -515,19 +515,6 @@ class WriteDAOD_SCTVALIDStream(JobProperty):
 jobproperties.PrimaryDPDFlags.add_JobProperty(WriteDAOD_SCTVALIDStream)
 listRAWtoDPD.append(WriteDAOD_SCTVALIDStream.StreamName)
 
-class WriteDAOD_PIXELVALIDStream(JobProperty):
-    """ Produce the DPD for DAOD_PIXELVALID - AOD with PrepRawData """
-    statusOn     = True
-    allowedTypes = ['bool']
-    StoredValue  = False
-    StreamName   = "StreamDAOD_PIXELVALID"
-    FileName     = ""
-    isVirtual      = False
-    DPDMakerScript = "InDetPrepRawDataToxAOD/PixelxAOD.py"
-    pass
-jobproperties.PrimaryDPDFlags.add_JobProperty(WriteDAOD_PIXELVALIDStream)
-listRAWtoDPD.append(WriteDAOD_PIXELVALIDStream.StreamName)
-
 class WriteDAOD_IDTIDEStream(JobProperty):
     """ Produce the DPD for DAOD_IDTIDE - AOD with PrepRawData """
     statusOn     = True
diff --git a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
index 02a7462d2b73bf2fc8f2adec56d63d6b95c331fc..c4c508aece8f7926229d9f1acb5278e3025af7a3 100755
--- a/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
+++ b/Reconstruction/RecExample/RecExCond/share/RecExCommon_flags.py
@@ -465,14 +465,16 @@ else:
           jobproperties.set_JobProperties(data)
        else:   
           i_value=RecExCommonFlags.get(i)
-          jpvalue = getattr(jobproperties.AthenaCommonFlags, i)()
-          if i!="PoolRDOInput":
-            if i_value!=jpvalue:
-               logRecExCommon_flags.info('inconsistency: for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
-          else:   
-            if i_value!=jpvalue:
-               logRecExCommon_flags.info ('Modified value for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
-
+          if getattr(jobproperties.AthenaCommonFlags, i).statusOn:
+              jpvalue = getattr(jobproperties.AthenaCommonFlags, i)()
+              if i!="PoolRDOInput":
+                if i_value!=jpvalue:
+                   logRecExCommon_flags.info('inconsistency: for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
+              else:
+                if i_value!=jpvalue:
+                   logRecExCommon_flags.info ('Modified value for flag %s new flag: %s old flag:%s',i,jpvalue,i_value)
+          else:
+              logRecExCommon_flags.info('Modified value for flag %s new flag: unset, old flag %s',i,i_value)
 
 # some special migration (temporary)
 if rec.doFloatingPointException() and not athenaCommonFlags.isOnline():
diff --git a/Reconstruction/RecJobTransforms/scripts/Reco_tf.py b/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
index 958cb866868f1dc8dd3aab592ce46d9583747ea7..759fb5f4372138ca35853e9a71ef4f5733ccd553 100755
--- a/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
+++ b/Reconstruction/RecJobTransforms/scripts/Reco_tf.py
@@ -65,9 +65,9 @@ def getTransform(RAWtoALL=False):
     # For digi step - make sure we can add the digitisation/simulation arguments
     # before we add this substep; allows Reco_tf to work without AtlasSimulation
     try:
-        from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addBasicDigiArgs, addPileUpTrfArgs, addCommonSimDigTrfArgs
+        from SimuJobTransforms.simTrfArgs import addForwardDetTrfArgs, addPileUpTrfArgs, addCommonSimDigTrfArgs
         from SimuJobTransforms.SimTransformUtils import addDigitizationSubstep
-        addBasicDigiArgs(trf.parser)
+        # NB "Basic Digi Args" are added by the overlay setup below, so no need for addBasicDigiArgs here
         addForwardDetTrfArgs(trf.parser)
         addPileUpTrfArgs(trf.parser)
         addCommonSimDigTrfArgs(trf.parser)