diff --git a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/WebServer.java b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/WebServer.java
index fb5ad21..3c67774 100644
--- a/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/WebServer.java
+++ b/hyracks-control-cc/src/main/java/edu/uci/ics/hyracks/control/cc/web/WebServer.java
@@ -68,6 +68,7 @@
         addHandler(handler);
 
         String basedir = System.getProperty("basedir");
+        LOGGER.info("Starting Webserver with basedir = " + basedir);
         if (basedir != null) {
             File warFile = new File(basedir, "console/hyracks-admin-console.war");
             LOGGER.info("Looking for admin console binary in: " + warFile.getAbsolutePath());
diff --git a/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/drivers/VirtualClusterDriver.java b/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/drivers/VirtualClusterDriver.java
index 92a1ad5..2d27afb 100644
--- a/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/drivers/VirtualClusterDriver.java
+++ b/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/drivers/VirtualClusterDriver.java
@@ -29,6 +29,9 @@
 
         @Option(name = "-cc-port", required = false, usage = "CC Port (default: 1099)")
         public int ccPort = 1099;
+
+        @Option(name = "-cc-http-port", required = false, usage = "CC Port (default: 0)")
+        public int ccHttpPort = 0;
     }
 
     public static void main(String[] args) throws Exception {
@@ -44,6 +47,7 @@
 
         CCConfig ccConfig = new CCConfig();
         ccConfig.port = options.ccPort;
+        ccConfig.httpPort = options.ccHttpPort;
         HyracksCCProcess ccp = new HyracksCCProcess(ccConfig);
         ccp.start();
 
diff --git a/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/process/HyracksServerProcess.java b/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/process/HyracksServerProcess.java
index 17169ac..0531665 100644
--- a/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/process/HyracksServerProcess.java
+++ b/hyracks-server/src/main/java/edu/uci/ics/hyracks/server/process/HyracksServerProcess.java
@@ -62,6 +62,7 @@
     private String[] buildCommand() {
         List<String> cList = new ArrayList<String>();
         cList.add(getJavaCommand());
+        cList.add("-Dbasedir=" + System.getProperty("basedir"));
         cList.add("-classpath");
         cList.add(getClasspath());
         cList.add(getMainClassName());