Fix issues to xmltocmake