more xml validation fixes