Collect form finalization improvements