Final changes from CERN machine.