diff --git a/README.adoc b/README.adoc
index aba5db1..d76662c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -145,21 +145,21 @@ hello2 cleanup
 
 which are `printk` messages from `init` and `cleanup` methods of those modules.
 
+Sources:
+
+* link:packages/kernel_modules/hello.c[]
+* link:packages/kernel_modules/hello2.c[]
+
 Quit QEMU with:
 
 ....
 Ctrl-A X
 ....
 
-Sources:
-
-* link:packages/kernel_modules/hello.c[]
-* link:packages/kernel_modules/hello2.c[]
+See also: <<quit-qemu-from-text-mode>>.
 
 All available modules can be found in the link:packages/kernel_modules/[`kernel_modules` directory].
 
-See also: <<quit-qemu-from-text-mode>>.
-
 I now urge you to read the following sections which contain widely applicable information:
 
 * <<run-command-after-boot>>
diff --git a/configure b/configure
index 1678a64..b97a211 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -eu
 interactive_pkgs=libsdl2-dev
 gem5=false
 qemu=true
@@ -105,6 +105,7 @@ fi
 if "$gem5"; then
   submodules="${submodules} gem5"
 fi
+submodules="$(for submodule in ${submodules}; do printf "submodules/${submodule} "; done)"
 (
   set -e
   # Shallow cloning saves a considerable amount of time, specially because of the linux kernel.
@@ -113,9 +114,7 @@ fi
   # In particular:
   # - `shallow = true` on the submodule has no effect for the non default educational branches of our submodules
   # - QEMU's submodules point to commits that are neither under branches nor tags, and so `--shallow-submodules` fails
-  for submodule in submodules/*/; do
-    git submodule update --depth 1 $gitjobs --init -- "submodules/${submodule}"
-  done
+  git submodule update --depth 1 $gitjobs --init -- ${submodules}
   if "$qemu"; then
     git -C submodules/qemu submodule update --init --recursive
   fi