diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm
index e66d56b1..9428a470 100644
--- a/common/modules/addons.jsm
+++ b/common/modules/addons.jsm
@@ -220,7 +220,7 @@ var Addon = Class("Addon", {
             DOM(node).append(isArray(xml) || isXML(xml) ? xml : DOM.DOMString(xml));
         }
 
-        update("name", template_.icon({ icon: this.iconURL }, this.name));
+        update("name", template.icon({ icon: this.iconURL }, this.name));
         this.nodes.version.textContent = this.version;
         update("status", this.statusInfo);
         this.nodes.description.textContent = this.description;
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 10d0ce07..e7460ed3 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -782,7 +782,7 @@ var DOM = Class("DOM", {
     html: function html(txt, self) {
         return this.getSet(arguments,
                            function (elem) elem.innerHTML,
-                           function (elem, val) { elem.innerHTML = val });
+                           util.wrapCallback(function (elem, val) { elem.innerHTML = val }));
     },
 
     text: function text(txt, self) {