More edits to validations