Fix Some validation