Fix for xml issues