Fixes during 2dx beamtime