Minor

XML templates defaults and importer.inc to preserve those