diff --git a/mmc/obmc-flash-bios b/mmc/obmc-flash-bios
index 60490b2..478e63f 100644
--- a/mmc/obmc-flash-bios
+++ b/mmc/obmc-flash-bios
@@ -35,11 +35,11 @@
   fi
   if [ "${running_label}" != "${boot_label}" ]; then
     # Copy off the preserved partitions
-    # A line in the pnor.toc looks like this:
+    # A line in the pnor.toc (81e00994.lid) looks like this:
     # partition05=SECBOOT,0x00381000,0x003a5000,00,ECC,PRESERVED
     rm -f ${prsv_dir}/*
-    if [ -f ${ro_dir}/pnor.toc ]; then
-      prsvs=$(grep PRESERVED ${ro_dir}/pnor.toc)
+    if [ -f "${ro_dir}/81e00994.lid" ]; then
+      prsvs=$(grep PRESERVED "${ro_dir}/81e00994.lid")
       for prsv in ${prsvs}; do
         prsv=${prsv##partition*=}
         prsv=$(echo "${prsv}" | cut -d "," -f 1)
diff --git a/mmc/openpower-update-bios-attr-table.service b/mmc/openpower-update-bios-attr-table.service
index 898cb7e..6dbb608 100644
--- a/mmc/openpower-update-bios-attr-table.service
+++ b/mmc/openpower-update-bios-attr-table.service
@@ -3,6 +3,7 @@
 After=org.open_power.Software.Host.Updater.service
 After=obmc-flash-bios-init.service
 After=openpower-process-host-firmware.service
+Before=mboxd.service
 
 [Service]
 Type=oneshot