Add form control fixes