Small fixes, XmlParser started