Fix form button handlers