Fix some issues with the form helpers