Minor changes to run the analyzer on the CNAF machine.