QC fixes to the form