Fix validation so they will work.
Merge pull request #461 from electrical/fix_validation

Fix validation so they will work.