Updates to forms and validators