Validation factory tweaks
Validator constructor fixes
Merge. Fix conflicts.