Fixed XML parsing exceptions