Chang for some bugs and xml files