small changes to match CMSSW_5_3_19