diff --git a/packaging/rc.d/albatross_console b/packaging/rc.d/albatross_console
index ef8845f..21eeff5 100755
--- a/packaging/rc.d/albatross_console
+++ b/packaging/rc.d/albatross_console
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_console
 # REQUIRE: LOGIN
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_console_* variables in one of these files
 # 	 /etc/rc.conf
@@ -33,7 +33,7 @@ procname="/usr/local/libexec/albatross/vmmd_console"
 
 albatross_console_start () {
     /usr/sbin/daemon -S -p "${pidfile}" -u "${albatross_console_user}" \
-		     "${procname}" "${albatross_console_flags}"
+		     "${procname}" ${albatross_console_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_daemon b/packaging/rc.d/albatross_daemon
index 8ec44fa..44d4f53 100755
--- a/packaging/rc.d/albatross_daemon
+++ b/packaging/rc.d/albatross_daemon
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_daemon
 # REQUIRE: LOGIN albatross_console albatross_log albatross_stat
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_daemon_* variables in one of these files
 # 	 /etc/rc.conf
@@ -68,7 +68,7 @@ albatross_daemon_precmd() {
 
 albatross_daemon_start () {
     /usr/sbin/daemon -S -p "${pidfile}" "${procname}" \
-                     "${albatross_daemon_flags}"
+                     ${albatross_daemon_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_influx b/packaging/rc.d/albatross_influx
index 21a050c..eba847a 100755
--- a/packaging/rc.d/albatross_influx
+++ b/packaging/rc.d/albatross_influx
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_influx
 # REQUIRE: LOGIN albatross_stat
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_influx_* variables in one of these files
 # 	 /etc/rc.conf
@@ -63,7 +63,7 @@ albatross_influx_precmd() {
 
 albatross_influx_start () {
     /usr/sbin/daemon -S -p "${pidfile}" -u "${albatross_influx_user}" \
-		     "${procname}" "${albatross_influx_flags}"
+		     "${procname}" ${albatross_influx_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_log b/packaging/rc.d/albatross_log
index f44b2ea..b8d8eb3 100755
--- a/packaging/rc.d/albatross_log
+++ b/packaging/rc.d/albatross_log
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_log
 # REQUIRE: LOGIN
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_log_* variables in one of these files
 # 	 /etc/rc.conf
@@ -41,7 +41,7 @@ albatross_log_precmd () {
 
 albatross_log_start () {
     /usr/sbin/daemon -S -p "${pidfile}" -u "${albatross_log_user}" \
-		     "${procname}" "${albatross_log_flags}"
+		     "${procname}" ${albatross_log_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_stat b/packaging/rc.d/albatross_stat
index 305f6cc..c460a87 100755
--- a/packaging/rc.d/albatross_stat
+++ b/packaging/rc.d/albatross_stat
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_stat
 # REQUIRE: LOGIN
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_stat_* variables in one of these files
 # 	 /etc/rc.conf
@@ -33,7 +33,7 @@ procname="/usr/local/libexec/albatross/vmmd_stats"
 
 albatross_stat_start () {
     /usr/sbin/daemon -S -p "${pidfile}" -u "${albatross_stat_user}" \
-		     "${procname}" "${albatross_stat_flags}"
+		     "${procname}" ${albatross_stat_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_tls b/packaging/rc.d/albatross_tls
index eef0406..e736089 100755
--- a/packaging/rc.d/albatross_tls
+++ b/packaging/rc.d/albatross_tls
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_tls
 # REQUIRE: LOGIN albatross_daemon
-# KEYWORD: shutdown nojail
+# KEYWORD: shutdown
 #
 # Define these albatross_tls_* variables in one of these files
 # 	 /etc/rc.conf
@@ -63,7 +63,7 @@ albatross_tls_precmd() {
 
 albatross_tls_start () {
     /usr/sbin/daemon -S -p "${pidfile}" -u "${albatross_tls_user}" \
-		     "${procname}" "${albatross_tls_flags}"
+		     "${procname}" ${albatross_tls_flags}
 }
 
 run_rc_command "$1"
diff --git a/packaging/rc.d/albatross_x b/packaging/rc.d/albatross_x
index 257110b..c1af803 100755
--- a/packaging/rc.d/albatross_x
+++ b/packaging/rc.d/albatross_x
@@ -4,7 +4,7 @@
 #
 # PROVIDE: albatross_x
 # REQUIRE: LOGIN albatross_daemon
-# KEYWORDS: shutdown nojail
+# KEYWORDS: shutdown
 #
 # Define these albatross_x_* variables in one of these files
 # 	 /etc/rc.conf
@@ -52,7 +52,7 @@ albatross_x_start () {
 
 albatross_x_stop () {
     case $1 in
-	ALL)
+	_ALL)
 	    for _vm in $albatross_x_vms
 	    do /usr/local/sbin/vmmc_local destroy $_vm; done
 	    return
@@ -62,8 +62,7 @@ albatross_x_stop () {
 }
 
 albatross_x_status () {
-    for _vm in $@
-    do /usr/local/sbin/vmmc_local info $_vm; done
+    /usr/local/sbin/vmmc_local info
 }
 
 case $# in