[FOLD] Validators fixes