Fixed XML parsing