diff --git a/build_library/check_root b/build_library/check_root
index c5e6737dfe..c3c4ee17a2 100755
--- a/build_library/check_root
+++ b/build_library/check_root
@@ -29,7 +29,8 @@ IGNORE_MISSING = {
                                  SonameAtom("x86_64", "libc.so.6")],
 
     # RPATHs and symlinks apparently confuse the perl-5.24 package
-    "dev-lang/perl":            [SonameAtom("x86_64", "libperl.so.5.24.1")],
+    "dev-lang/perl":            [SonameAtom("x86_64", "libperl.so.5.26.2")],
+    "sys-apps/texinfo":         [SonameAtom("x86_64", "libperl.so.5.26")],
 
     # https://bugs.gentoo.org/show_bug.cgi?id=554582
     "net-firewall/ebtables":    [SonameAtom("x86_64", "libebt_802_3.so"),
diff --git a/build_library/disk_util b/build_library/disk_util
index 9c400c1cab..0e79976860 100755
--- a/build_library/disk_util
+++ b/build_library/disk_util
@@ -420,7 +420,7 @@ def FormatFat(part, device):
   vfat_block_size = 1024
   vfat_blocks = part['bytes'] // vfat_block_size
 
-  cmd = ['mkfs.vfat']
+  cmd = ['mkfs.vfat', '-I']
   if 'fs_label' in part:
     cmd += ['-n', part['fs_label']]
   if part['type'] == 'efi':
diff --git a/build_library/test_image_content.sh b/build_library/test_image_content.sh
index d22ab677c6..1071465c04 100644
--- a/build_library/test_image_content.sh
+++ b/build_library/test_image_content.sh
@@ -4,7 +4,6 @@
 
 GLSA_WHITELIST=(
 	201412-09 # incompatible CA certificate version numbers
-	201810-10 # we fixed the systemd CVEs in 238, but this wants 239
 )
 
 glsa_image() {
diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh
index ea65013577..293d9656af 100644
--- a/build_library/toolchain_util.sh
+++ b/build_library/toolchain_util.sh
@@ -189,9 +189,7 @@ get_cross_pkgs() {
 # Get portage arguments restricting toolchains to binary packages only.
 get_binonly_args() {
     local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
-    # XXX: Drop this exception after stable > 1925.
-    local tmppkgs=( ${pkgs[*]##*/glibc} ) ; tmppkgs=( ${tmppkgs[*]##*/binutils} )
-    echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
+    echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
 }
 
 ### Toolchain building utilities ###
diff --git a/update_chroot b/update_chroot
index b9e2ec045e..254b89dc5f 100755
--- a/update_chroot
+++ b/update_chroot
@@ -233,9 +233,6 @@ if [ "${FLAGS_workon}" -eq "${FLAGS_TRUE}" ]; then
   done
 fi
 
-# XXX: Work around a rename; delete this after SDKs contain the new package.
-sudo -E ${EMERGE_CMD} --rage-clean app-crypt/sbsigntool dev-util/cargo 2>/dev/null || :
-
 # Second pass, update everything else.
 EMERGE_FLAGS+=( --deep )
 info "Updating all SDK packages"