diff --git a/Orchard/src/orc/OrchardDemo.java b/Orchard/src/orc/OrchardDemo.java
index 6ff2ec85d..c41488ef1 100644
--- a/Orchard/src/orc/OrchardDemo.java
+++ b/Orchard/src/orc/OrchardDemo.java
@@ -8,6 +8,8 @@
 import org.mortbay.jetty.nio.SelectChannelConnector;
 import org.mortbay.jetty.webapp.WebAppContext;
 
+import com.centerkey.utils.BareBonesBrowserLaunch;
+
 /**
  * Run this from the command line to start a standalone Orchard server.
  * @author quark
@@ -37,5 +39,6 @@ public static void main(String args[]) throws Exception {
         
         server.setStopAtShutdown(true);
         server.start();
+        BareBonesBrowserLaunch.openURL("http://localhost:" + PORT + "/demo.shtml");
     }
 }
diff --git a/Orchard/src/orc/orchard/OilSecurityValidator.java b/Orchard/src/orc/orchard/OilSecurityValidator.java
index 24259eb29..3823f5d1b 100644
--- a/Orchard/src/orc/orchard/OilSecurityValidator.java
+++ b/Orchard/src/orc/orchard/OilSecurityValidator.java
@@ -60,8 +60,8 @@ public class OilSecurityValidator extends Walker {
 		allowedClasses.add("java.util.Vector");
 		
 		// orc.lib
-		allowedClasses.add("orc.lib.data.Set");
-		allowedClasses.add("orc.lib.data.Map");
+		allowedClasses.add("orc.lib.state.Set");
+		allowedClasses.add("orc.lib.state.Map");
 		allowedClasses.add("orc.lib.net.Upcoming");
 		allowedClasses.add("orc.lib.net.Geocoder");
 		allowedClasses.add("orc.lib.net.GoogleCalendar");