Minor validation changes for more consistent behavior