fixes for form validation