diff --git a/.travis.yml b/.travis.yml
index 2b979eac..d7ed949d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,5 @@ script: |
   # libsdl2-dev : Depends: libegl1-mesa-dev
   #            Depends: libgles2-mesa-dev
   bash -x ./build-qemu -j 16 -S |& awk 'NR % 1000 == 0'
-  bash -x ./build -j 16 -S |& awk 'NR % 1000 == 0'
-  bash -x ./run -e 'init=/poweroff.out'
+  bash -x ./build-buildroot -j 16 -S |& awk 'NR % 1000 == 0'
+  bash -x ./run --kernel-cli 'init=/poweroff.out'
diff --git a/bench-all b/bench-all
index 845c22fe..928a0924 100755
--- a/bench-all
+++ b/bench-all
@@ -84,7 +84,7 @@ do_bench_buildroot_build() (
   "${root_dir}/build-buildroot" --arch "$arch" $baseline --buildroot-build-id "$build_id" --no-all -- source
   "${root_dir}/build-buildroot" --arch "$arch" $baseline --buildroot-build-id "$build_id"
   cp "${common_build_dir}/build-time.log" "${new_dir}/buildroot-build-time-${baseline_suffix}${arch}.log"
-  wc -c "${images_dir}/"* > "${new_dir}/buildroot-image-size-${baseline_suffix}${arch}.log"
+  wc -c "${common_images_dir}/"* > "${new_dir}/buildroot-image-size-${baseline_suffix}${arch}.log"
   "${root_dir}/build-buildroot" --arch "$arch" $baseline --buildroot-build-id "$build_id" --clean
 )
 
@@ -98,10 +98,10 @@ fi
 
 if "$bench_gem5_build"; then
   common_arch="$default_arch"
-  gem5_build_id=bench-build
-  common_gem5_build_dir="$("$getvar" --arch "$common_arch" --gem5-build-id "$gem5_build_id" gem5_out_dir)"
+  gem5_build_id=bench
+  common_gem5_build_dir="$("$getvar" --arch "$common_arch" --gem5-build-id "$gem5_build_id" gem5_build_dir)"
   common_gem5_src_dir="$("$getvar" --arch "$common_arch" --gem5-build-id "$gem5_build_id" gem5_src_dir)"
-  results_file="${common_gem5_build_dir}/bench-build.txt"
+  results_file="${common_gem5_build_dir}/lkmc-bench-build.txt"
   git -C "${common_gem5_src_dir}" clean -xdf
   rm -f "$results_file"
   "${root_dir}/build-gem5" --arch "$common_arch" --clean --gem5-build-id "$gem5_build_id"
diff --git a/bench-cmd b/bench-cmd
index 5b1dbe22..de36443d 100755
--- a/bench-cmd
+++ b/bench-cmd
@@ -12,6 +12,7 @@ cmd="$1"
 shift
 # Where to append write results to. Default: /dev/null.
 results_file="${1:-/dev/null}"
+mkdir -p "$(dirname "$results_file")"
 printf 'cmd ' >> "$results_file"
 env time --append -f 'time %e' --output="$results_file" "${root_dir}/eeval" -a "$cmd" "$results_file"
 printf "exit_status $?\n" >> "$results_file"
diff --git a/build-all b/build-all
index e9bcbce0..dc5471e0 100755
--- a/build-all
+++ b/build-all
@@ -15,7 +15,7 @@ done
 shift "$(($OPTIND - 1))"
 for arch in $archs; do
   ./build-qemu --arch "$arch"
-  ./build --arch "$arch" --kernel-modules -l "$@"
+  ./build-buildroot --arch "$arch" --kernel-modules -l "$@"
   if "$gem5"; then
     ./build-gem5 --arch "$arch"
   fi