diff --git a/files/apts/general b/files/apts/general
index 32379c09d9..b47a60d149 100644
--- a/files/apts/general
+++ b/files/apts/general
@@ -12,3 +12,7 @@ vim-nox
 locate # useful when debugging
 python-virtualenv
 python-unittest2
+iputils-ping
+wget
+curl
+tcpdump
diff --git a/stackrc b/stackrc
index aaee6ec50f..28cdc22326 100644
--- a/stackrc
+++ b/stackrc
@@ -12,7 +12,7 @@ KEYSTONE_BRANCH=diablo
 
 # a websockets/html5 or flash powered VNC console for vm instances
 NOVNC_REPO=https://github.com/cloudbuilders/noVNC.git
-NOVNC_BRANCH=master
+NOVNC_BRANCH=diablo
 
 # django powered web control panel for openstack
 DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git
@@ -28,7 +28,7 @@ OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git
 OPENSTACKX_BRANCH=diablo
 
 # Specify a comma-separated list of uec images to download and install into glance.
-IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz
+IMAGE_URLS=http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz,http://uec-images.ubuntu.com/oneiric/current/oneiric-server-cloudimg-amd64.tar.gz
 
 # allow local overrides of env variables
 if [ -f ./localrc ]; then