diff --git a/mozilla/extensions/cview/resources/content/cview-rdf.js b/mozilla/extensions/cview/resources/content/cview-rdf.js
index c842d378e47..724558bfa33 100644
--- a/mozilla/extensions/cview/resources/content/cview-rdf.js
+++ b/mozilla/extensions/cview/resources/content/cview-rdf.js
@@ -154,7 +154,7 @@ function rdf_duassert (n1, a, n2)
         return;
     }
     
-    return this.ds.Change (n1, a, oldN2, n2);
+    this.ds.Change (n1, a, oldN2, n2);
     
 }
 
diff --git a/mozilla/extensions/cview/resources/content/cview-utils.js b/mozilla/extensions/cview/resources/content/cview-utils.js
index 11842eee2e9..1f46d3d5c8a 100644
--- a/mozilla/extensions/cview/resources/content/cview-utils.js
+++ b/mozilla/extensions/cview/resources/content/cview-utils.js
@@ -28,6 +28,7 @@
  * avoid a dependancy on chatzilla
  */
 
+var dumpln;
 if (typeof document == "undefined") /* in xpcshell */
     dumpln = print;
 else
@@ -39,6 +40,7 @@ else
     else
         dumpln = function () {} /* no suitable function */
 
+var dd;
 if (DEBUG)
     dd = dumpln;
 else
@@ -116,7 +118,7 @@ function dumpObjectTree (o, recurse, compress, level)
             case "function":
                 var sfunc = o[i].toString().split("\n");
                 if (sfunc[2] == "    [native code]")
-                    var sfunc = "[native code]";
+                    sfunc = "[native code]";
                 else
                     sfunc = sfunc.length + " lines";
                 s += pfx + tee + i + " (function) " + sfunc + "\n";
diff --git a/mozilla/extensions/cview/resources/content/tree-utils.js b/mozilla/extensions/cview/resources/content/tree-utils.js
index 1788c5c7dcb..3e41b5dd885 100644
--- a/mozilla/extensions/cview/resources/content/tree-utils.js
+++ b/mozilla/extensions/cview/resources/content/tree-utils.js
@@ -860,7 +860,10 @@ function tolr_getshare()
     if (this.parentRecord)
         return this.parentRecord._share;
     else
+    {
         ASSERT (0, "TOLabelRecord cannot be the root of a visible tree.");
+        return null;
+    }
 }
 
 /* TORootRecord is used internally by TreeOView, you probably don't need to make
@@ -1146,7 +1149,7 @@ function tov_getcelltxt (index, colID)
     if (row._colValues)
         return row._colValues[colID];
     else
-        return;
+        return null;
 }
 
 TreeOView.prototype.getCellProperties =