diff --git a/chrome/content/zotero/webpagedump/common.js b/chrome/content/zotero/webpagedump/common.js
index 2b04f615a1..ffe967b710 100644
--- a/chrome/content/zotero/webpagedump/common.js
+++ b/chrome/content/zotero/webpagedump/common.js
@@ -519,6 +519,9 @@ var wpdCommon = {
 
 	removeNodeFromParent : function(aNode)
 	{
+		// Added by Dan S. for Zotero
+		var document = aNode.ownerDocument;
+		
 		var newNode = document.createTextNode("");
 		aNode.parentNode.replaceChild(newNode, aNode);
 		aNode = newNode;
diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
index 2b8f60c3da..2ad1913649 100644
--- a/chrome/content/zotero/webpagedump/domsaver.js
+++ b/chrome/content/zotero/webpagedump/domsaver.js
@@ -197,8 +197,11 @@ var wpdDOMSaver = {
 			"movie"   		: false, 
 			"archive" 		: false, 
 			"custom"  		: "",       // comma delimited custom extensions (e.g. doc,xls,...)
-			"format"  		: true,     // when false we get only naked html without images 
-			"script"  		: false,    // no scripts
+			"format"  		: true,     // when false we get only naked html without images
+			
+			// Changed by Dan for Zotero
+			"script"  		: true,    // no scripts
+			
 			"encodeUTF8"	: false,    // write the DOM Tree as UTF-8 and change the charset entry of the document
 			"metainfo"	  : true,     // include meta tags with URL and date/time information
 			"metacharset" : false     // if the meta charset is defined inside html override document charset
@@ -253,7 +256,7 @@ var wpdDOMSaver = {
 		var flag = false;
 		switch ( ext )
 		{
-		  case "jpg" : case "jpeg" : case "png" : case "g,if" : flag = this.option["image"];   break;
+		  case "jpg" : case "jpeg" : case "png" : case "gif" : flag = this.option["image"];   break;
 			case "mp3" : case "wav"  : case "ram" : case "wma" : flag = this.option["sound"];   break;
 			case "mpg" : case "mpeg" : case "avi" : 
 			case "ram" : case "rm"   : case "mov" : case "wmv" : flag = this.option["movie"];   break;