diff --git a/etemplate/inc/class.etemplate_widget_transformer.inc.php b/etemplate/inc/class.etemplate_widget_transformer.inc.php
index 1a03b0c9df..51a1976fcf 100644
--- a/etemplate/inc/class.etemplate_widget_transformer.inc.php
+++ b/etemplate/inc/class.etemplate_widget_transformer.inc.php
@@ -111,7 +111,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
 		$unmodified = $attrs;
 
 		// run the transformation
-		foreach($this->transformation as $filter => $data)
+		foreach(static::$transformation as $filter => $data)
 		{
 			$this->action($filter, $data, $attrs);
 		}
diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index cd452cd940..fdd12ccbe6 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -76,8 +76,6 @@ var et2_link_to = et2_inputWidget.extend({
 	},
 
 	destroy: function() {
-		this._super.apply(this, arguments);
-
 		this.link_button = null;
 		this.status_span = null;
 		this.comment = null;
@@ -87,6 +85,8 @@ var et2_link_to = et2_inputWidget.extend({
 		this.file_upload.destroy();
 		this.file_upload = null;
 		this.div = null;
+
+		this._super.apply(this, arguments);
 	},
 
 	/**
@@ -762,7 +762,9 @@ var et2_link_string = et2_valueWidget.extend([et2_IDetachedDOM], {
 
 	destroy: function() {
 		this._super.apply(this, arguments);
-		this.node.children().unbind();
+		if (this.node != null) {
+			this.node.children().unbind();
+		}
 	},
 
 	set_value: function(_value) {
diff --git a/etemplate/js/et2_widget_template.js b/etemplate/js/et2_widget_template.js
index 30b575ce4f..66c3adb754 100644
--- a/etemplate/js/et2_widget_template.js
+++ b/etemplate/js/et2_widget_template.js
@@ -96,7 +96,7 @@ var et2_template = et2_DOMWidget.extend({
 			this.proxiedTemplate.isProxy = true;
 
 			// Disallow adding any new node to this template
-			this.supportedWidgetClasses = [];
+			//this.supportedWidgetClasses = [];
 		}
 	},