Fix the forms (not used before)