Minor validation changes