Some validation changes