Fixed form validation problems