Fix form helpers