More fixes to <Element /> and <Form />