Fixes for xml file