Small Changes to xml loading