Even much much more validation fixes