Fix XML error and add more corrections