Some cleanup and additions to validations