some validator checks fixes