various fixes for building cmssw using icc