A few validation fixes. Still wrong.