Issue 453

Tweaks to the validator