fix compilation bugs in CMSSW_6_2_4