Fixed XML issues in the Data/