Fixes further validator inconsistencies
Merge pull request #131 from johanmeiring/master

Additional validator inconsistency fixes