diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 8456e3dae15..4d6b9a9cbc1 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -255,6 +255,7 @@ mountFS() {
 
 
 # Try to find and mount the root device.
+sleep 3
 mkdir /mnt-root
 
 mountPoints=(@mountPoints@)
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index a86cb1c64fd..329bf44e5a9 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -92,7 +92,7 @@ with pkgs.lib;
       diskNr=0
       diskForAufs=
       for device in /dev/xvd*; do
-          if [ "$device" = /dev/xvda1 ]; then continue; fi
+          if [ "$device" = /dev/xvda -o "$device" = /dev/xvda1 ]; then continue; fi
           fsType=$(blkid -o value -s TYPE "$device" || true)
           if [ "$fsType" = swap ]; then
               echo "activating swap device $device..."