fixes for older CMSSW