diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index e32858e501..997c0a8a64 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -163,6 +163,11 @@ create_base_image() {
   sudo mkdir -p "${root_fs_dir}/usr/share/oem"
   sudo mount --bind "${oem_fs_dir}" "${root_fs_dir}/usr/share/oem"
 
+  # First thing first, install baselayout with USE=build to create a
+  # working directory tree. Don't use binpkgs due to the use flag change.
+  sudo -E USE=build ${EMERGE_BOARD_CMD} --root="${root_fs_dir}" \
+      --usepkg=n --buildpkg=n --oneshot --quiet --nodeps sys-apps/baselayout
+
   # We need to install libc manually from the cross toolchain.
   # TODO: Improve this? It would be ideal to use emerge to do this.
   PKGDIR="/var/lib/portage/pkgs"
@@ -181,6 +186,8 @@ create_base_image() {
     'usr/include' 'sys-include'
     # Link-time objects.
     '*.[ao]'
+    # Empty lib dirs, replaced by symlinks
+    'lib'
   )
   pbzip2 -dc --ignore-trailing-garbage=1 "${LIBC_PATH}" | \
     sudo tar xpf - -C "${root_fs_dir}" ./usr/${CHOST} \
diff --git a/build_library/set_lsb_release b/build_library/set_lsb_release
index 097e938832..93bb9cc737 100755
--- a/build_library/set_lsb_release
+++ b/build_library/set_lsb_release
@@ -83,15 +83,15 @@ $COREOS_VERSION_NAME release $COREOS_VERSION_STRING
 EOF
 
 # Aaaannd for the new systemd world order
-# os-release provides a seperate build-id field, so split it from version
+# os-release provides a separate build-id field, so split it from version
 OS_ID=$(tr '[:upper:]' '[:lower:]' <<<"$COREOS_VERSION_NAME")
-OS_VERION_ID="${COREOS_VERSION_STRING#*+}"
-OS_BUILD_ID="${COREOS_VERSION_STRING%%+*}"
+OS_VERSION_ID="${COREOS_VERSION_STRING%%+*}"
+OS_BUILD_ID="${COREOS_VERSION_STRING#*+}"
 sudo_clobber "${ROOT_FS_DIR}/etc/os-release" <<EOF
 NAME=$COREOS_VERSION_NAME
 ID=$OS_ID
 VERSION=$COREOS_VERSION_STRING
-VERSION_ID=$OS_VERION_ID
+VERSION_ID=$OS_VERSION_ID
 BUILD_ID=$OS_BUILD_ID
 PRETTY_NAME="$COREOS_VERSION_NAME $COREOS_VERSION_DESCRIPTION"
 ANSI_COLOR="1;32"