Mage XML file template has been omitted
Minor bugfixes. More clear template names