fix compilation issues + xml files