Fix form handling and method parameters