Fixes to allow multi step as well as multi page processes