Foundation: fix validators
Merge pull request #1133 from GProulx/ImprovingFoundationValidators

Foundation: fix validators