Added temporary fixes for XML