diff --git a/xos/core/admin.py b/xos/core/admin.py
index 88bc739..3633049 100644
--- a/xos/core/admin.py
+++ b/xos/core/admin.py
@@ -352,7 +352,8 @@
 
     def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
         if db_field.name == 'deployment':
-           kwargs['queryset'] = Deployment.select_by_acl(request.user)
+             
+           kwargs['queryset'] = Deployment.select_by_acl(request.user).filter(sitedeployments__nodes__isnull=False).distinct()
            kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_deployment_changed(this);"})
         if db_field.name == 'flavor':
            kwargs['widget'] = forms.Select(attrs={'onChange': "sliver_flavor_changed(this);"})
diff --git a/xos/scripts/opencloud b/xos/scripts/opencloud
index 910c966..4a82c03 100755
--- a/xos/scripts/opencloud
+++ b/xos/scripts/opencloud
@@ -182,6 +182,7 @@
 fi
 if [ "$COMMAND" = "resetdb" ]; then
     stopserver
+    ensure_postgres_running
     dropdb
     createdb
     syncdb
@@ -211,4 +212,4 @@
    remigrate
    createdb
    syncdb
-fi
\ No newline at end of file
+fi