diff --git a/modules/module-list.nix b/modules/module-list.nix
index 4addbda5760..eab8503f1ee 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -125,7 +125,7 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/etc/etc.nix
-  ./system/upstart-events/ctrl-alt-delete.nix
+  ./system/upstart-events/control-alt-delete.nix
   ./system/upstart-events/halt.nix
   ./system/upstart-events/maintenance-shell.nix
   ./system/upstart/upstart.nix
diff --git a/modules/system/upstart-events/ctrl-alt-delete.nix b/modules/system/upstart-events/control-alt-delete.nix
similarity index 62%
rename from modules/system/upstart-events/ctrl-alt-delete.nix
rename to modules/system/upstart-events/control-alt-delete.nix
index ae1ba2e342e..5fa2bd87eb9 100644
--- a/modules/system/upstart-events/ctrl-alt-delete.nix
+++ b/modules/system/upstart-events/control-alt-delete.nix
@@ -3,10 +3,10 @@
 ###### implementation
 
 {
-  jobs.ctrl_alt_delete =
-    { name = "ctrl-alt-delete";
+  jobs.control_alt_delete =
+    { name = "control-alt-delete";
 
-      startOn = "ctrlaltdel";
+      startOn = "control-alt-delete";
 
       task = true;
 
diff --git a/modules/tasks/kbd.nix b/modules/tasks/kbd.nix
index 9ba7f973cf3..8ed4b44f91b 100644
--- a/modules/tasks/kbd.nix
+++ b/modules/tasks/kbd.nix
@@ -59,9 +59,11 @@ in
     jobs.kbd =
       { description = "Keyboard / console initialisation";
 
-        startOn = "udev";
+        startOn = "started udev";
 
-        preStart = ''
+        task = true;
+
+        script = ''
           export LANG=${defaultLocale}
           export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive
           export PATH=${pkgs.gzip}/bin:$PATH # Needed by setfont
diff --git a/modules/tasks/lvm.nix b/modules/tasks/lvm.nix
index 4da517deae1..92dfd52aefd 100644
--- a/modules/tasks/lvm.nix
+++ b/modules/tasks/lvm.nix
@@ -7,7 +7,7 @@
   config = {
 
     jobs.lvm =
-      { startOn = " udev"; # !!! or on new-devices
+      { startOn = "started udev or new-devices";
 
         script =
           ''
diff --git a/modules/tasks/swraid.nix b/modules/tasks/swraid.nix
index 6e29062f0a9..74a34ba5689 100644
--- a/modules/tasks/swraid.nix
+++ b/modules/tasks/swraid.nix
@@ -13,7 +13,7 @@ in
 {
 
   jobs.swraid =
-    { startOn = "udev"; # !!! or on "new-devices"
+    { startOn = "started udev or new-devices";
       
       script =
         ''
@@ -25,6 +25,8 @@ in
       
           # Scan /proc/partitions for RAID devices.
           ${mdadm}/sbin/mdadm --examine --brief --scan -c partitions > ${tempConf}
+          
+          if ! test -s ${tempConf}; then exit 0; fi
       
           # Activate each device found.
           ${mdadm}/sbin/mdadm --assemble -c ${tempConf} --scan