Fixed some form handling.