Fixed some form validator problems