Fix errors dealing with Forms