diff --git a/demos/form2/js/form.js b/demos/form2/js/form.js
index 54bd8053..1ffe424a 100644
--- a/demos/form2/js/form.js
+++ b/demos/form2/js/form.js
@@ -6,9 +6,9 @@ Ox.load({UI: {}, Geo:{}, Unicode: {}}, function() {
                 id: "panel"
             })
             .appendTo($body),
-        countries = Ox.sortASCII(Ox.map(Ox.COUNTRIES, function(country) {
+        countries = Ox.sortASCII(Ox.filter(Ox.map(Ox.COUNTRIES, function(country) {
             return country.dissolved ? null : country.name;
-        }));
+        })));
         objects = {
             "Button": [
                 {
@@ -1278,4 +1278,4 @@ Ox.load({UI: {}, Geo:{}, Unicode: {}}, function() {
         })
         .appendTo($panel);
 
-});
\ No newline at end of file
+});
diff --git a/examples/widget_design_patterns/index.html b/examples/widget_design_patterns/index.html
index e551837e..9bc8aca5 100644
--- a/examples/widget_design_patterns/index.html
+++ b/examples/widget_design_patterns/index.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" type="text/css" href="css/example.css"/>
         <script type="text/javascript" src="../../dev/Ox.js"></script>
         <script type="text/javascript" src="js/example.js"></script>
-        <script>window.addEventListener('message', function(e) { eval(e.data); });</script>
+        <script>window.addEventListener('message', function(e) { e.origin == window.location.origin && eval(e.data); });</script>
     </head>
     <body></body>
-</html>
\ No newline at end of file
+</html>
