Additional fixes to multipage forms