diff --git a/mozilla/extensions/xforms/resources/content/input-xhtml.xml b/mozilla/extensions/xforms/resources/content/input-xhtml.xml
index 9d7488611ab..30d8e715398 100644
--- a/mozilla/extensions/xforms/resources/content/input-xhtml.xml
+++ b/mozilla/extensions/xforms/resources/content/input-xhtml.xml
@@ -342,7 +342,7 @@
                 var walker = this.ownerDocument.createTreeWalker(
                   this.pickerContent, NodeFilter.SHOW_ELEMENT, null, false);
                 var child = null;
-                while (child = walker.nextNode()) {
+                while ((child = walker.nextNode())) {
                   if (child == aNode)
                     return true;
                 }
diff --git a/mozilla/extensions/xforms/resources/content/widgets.xml b/mozilla/extensions/xforms/resources/content/widgets.xml
index 88ff02d603a..2172bd0d28a 100644
--- a/mozilla/extensions/xforms/resources/content/widgets.xml
+++ b/mozilla/extensions/xforms/resources/content/widgets.xml
@@ -240,6 +240,8 @@
             case 4: case 6: case 9: case 11:
               return 30;
           }
+          // XXX: throw error?
+          return 0;
         ]]>
         </body>
       </method>