[FOLD] Validator fixes