Fixes to get generic scan working on beamline