Even much more validation fixes