Minor Validation fixes