fixes for the form validator