And more validation fixes