Made more XML compat