Add changes to work on Linux and within CMSSW