@WouterJ do these additions already fix the xml config issue #128 or is more needed?