corrected some bugs for CMSSW_5xx