diff --git a/modules/system/upstart/upstart.nix b/modules/system/upstart/upstart.nix
index 7373bed5390d..368405badc76 100644
--- a/modules/system/upstart/upstart.nix
+++ b/modules/system/upstart/upstart.nix
@@ -322,7 +322,7 @@ in
         This option defines the system jobs started and managed by the
         Upstart daemon.
       '';
-      type = types.attrsOf types.optionSet;
+      type = types.loaOf types.optionSet;
       options = [ jobOptions upstartJob ];
     };
   
diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 699e9b3c33ca..053597a1a5db 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -50,7 +50,8 @@ in
         <command>mkdir -p</command> .
       ";
       
-      type = types.nullOr (types.list types.optionSet);
+      type = types.nullOr (types.loaOf types.optionSet);
+      apply = x: attrValues x;
 
       options = {