Small changes to get working on beamline correctly