diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index e9008c31a..78304a3ab 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -167,8 +167,7 @@ mv -v /etc/bash_completion.d/grub /usr/share/bash-completion/completions</userin
       <varlistentry id="grub-glue-efi">
         <term><command>grub-glue-efi</command></term>
         <listitem>
-          <para>Processes ia32 and amd64 EFI images and glues them
-          according to Apple format.</para>
+          <para>Glue 32-bit and 64-bit binary into Apple universal one.</para>
           <indexterm zone="ch-system-grub grub-glue-efi">
             <primary sortas="b-grub-glue-efi">grub-glue-efi</primary>
           </indexterm>
diff --git a/chapter08/python.xml b/chapter08/python.xml
index da1f75cdc..0f50bf6ef 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -102,12 +102,24 @@
     <systemitem class='username'>root</systemitem> user.  The main reason
     of this recommendation is for avoiding a conflict with the system
     package manager (<command>dpkg</command> for example), but LFS does not
-    have a system-wide package manager so this is not a problem.  If desired,
-    suppress this warning by running the following commands:</para>
+    have a system-wide package manager so this is not a problem.  And,
+    <command>pip3</command> will attempt to check for a new version of
+    itself whenever it's run.  As domain name resolving is not configured
+    yet in LFS chroot environment, it will fail to check for a new version
+    and produce a warning.  Once we boot the LFS system and set up network
+    connection, it will then produce a warning telling the user to update it
+    from a pre-built wheel on PyPI if any new version is available.  But LFS
+    consider <command>pip3</command> a part of Python 3 so it should not be
+    updated separately, and an update from a pre-built wheel will deviate
+    from our purpose to build a Linux system from source code.  So the
+    warning for a new <command>pip3</command> version should be ignored as
+    well. If desired, suppress these warnings by running the following
+    commands:</para>
 
  <screen><userinput remap="install">cat &gt; /etc/pip.conf &lt;&lt; EOF
 [global]
 root-user-action = ignore
+disable-pip-version-check = true
 EOF
 </userinput></screen>
 <!--
diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index c569525c9..233902633 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -155,6 +155,38 @@ EOF</userinput></screen>
     <emphasis>set root</emphasis> line to point to the boot partition.
     </para></note>
 
+    <note>
+      <para>The GRUB designator for a partition may change if you added or
+      removed some disks (including removable disks like USB thumb devices).
+      The change may cause boot failure because
+      <filename>grub.cfg</filename> refers to some <quote>old</quote>
+      designators.  If you wish to avoid such a problem, you may use
+      the UUID of partition and filesystem instead of GRUB designator to
+      specify a partition.
+      Run <command>lsblk -o UUID,PARTUUID,PATH,MOUNTPOINT</command> to show
+      the UUID of your filesystems (in <literal>UUID</literal> column) and
+      partitions (in <literal>PARTUUID</literal> column).  Then replace
+      <literal>set root=(hdx,y)</literal> with
+      <literal>search --set=root --fs-uuid <replaceable>&lt;UUID of the filesystem where the kernel is installed&gt;</replaceable></literal>, and replace
+      <literal>root=/dev/sda2</literal> with
+      <literal>root=PARTUUID=<replaceable>&lt;UUID of the partition where LFS is built&gt;</replaceable></literal>.</para>
+      <para>Note that the UUID of a partition and the UUID of the filesystem
+      in this partition is completely different.  Some online resources may
+      instruct you to use
+      <literal>root=UUID=<replaceable>&lt;filesystem UUID&gt;</replaceable></literal>
+      instead of
+      <literal>root=PARTUUID=<replaceable>&lt;partition UUID&gt;</replaceable></literal>,
+      but doing so will require an initramfs which is beyond the scope of
+      LFS.</para>
+      <para>The name of the device node for a partition in
+      <filename class='directory'>/dev</filename> may also change (more
+      unlikely than GRUB designator change though).  You can also replace
+      paths to device nodes like <literal>/dev/sda1</literal> with
+      <literal>PARTUUID=<replaceable>&lt;partition UUID&gt;</replaceable></literal>,
+      in <filename>/etc/fstab</filename>, to avoid a potential boot failure
+      in case the device node name has changed.</para>
+    </note>
+
     <para>GRUB is an extremely powerful program and it provides a tremendous
     number of options for booting from a wide variety of devices, operating
     systems, and partition types.  There are also many options for customization
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 3d7953897..b4413f1ce 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -61,6 +61,11 @@
     url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     </para></listitem>
 
+    <listitem><para>Install <ulink
+    url='&blfs-book;postlfs/firmware.html'>firmwares</ulink> if the kernel
+    driver for your hardware require some firmware to function properly.
+    </para></listitem>
+
     <listitem><para>Finally, a review of the following configuration files
     is also appropriate at this point.</para>