Changes to get 2.67 working on the beamline