diff --git a/tools/build/onos-package b/tools/build/onos-package
index 72486ad..ae78091 100755
--- a/tools/build/onos-package
+++ b/tools/build/onos-package
@@ -50,7 +50,7 @@
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 
 
 # Patch the Apache Karaf distribution file to load ONOS features
-perl -pi.old -e 's|^(featuresBoot=.*)|\1,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-tvue|' \
+perl -pi.old -e 's|^(featuresBoot=.*)|\1,onos-api,onos-core,onos-cli,onos-rest,onos-gui,onos-openflow,onos-app-tvue,onos-app-fwd|' \
     $ONOS_STAGE/$KARAF_DIST/etc/org.apache.karaf.features.cfg 
 
 # Patch the Apache Karaf distribution with ONOS branding bundle
diff --git a/tools/test/bin/onos-install b/tools/test/bin/onos-install
index babfdef..9e17c76 100755
--- a/tools/test/bin/onos-install
+++ b/tools/test/bin/onos-install
@@ -16,9 +16,13 @@
 ssh $remote "
     [ -d $ONOS_INSTALL_DIR/bin ] && echo \"ONOS is already installed\" && exit 1
 
+    # Prepare a landing zone and unroll the bits
     sudo mkdir -p $ONOS_INSTALL_DIR && sudo chown sdn:sdn $ONOS_INSTALL_DIR
     tar zxmf /tmp/$ONOS_BITS.tar.gz -C $ONOS_INSTALL_DIR --strip-components=1
 
+    # Make a link to the log file directory.
     ln -s /opt/onos/$KARAF_DIST/data/log /opt/onos/log
-
+    
+    # TODO: Setup ONOS to run as a daemon; for now we at least startup
+    nohup /opt/onos/bin/onos-ctl server </dev/null 1>/opt/onos/svc.log 2>&1 &
 "
diff --git a/tools/test/bin/onos-log b/tools/test/bin/onos-log
index 611d6d7..698cc2f 100755
--- a/tools/test/bin/onos-log
+++ b/tools/test/bin/onos-log
@@ -10,6 +10,8 @@
 
 LOG=$ONOS_INSTALL_DIR/log/karaf.log
 
+trap "ssh $remote 'ps -ef | grep \"tail -n 512\" | grep -v grep | cut -c10-15 | xargs kill'" EXIT
+
 ssh $remote "
     while true; do
         [ ! -f $LOG ] && sleep 2 && continue