diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
index 64faf540184..54a212f6c36 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.C
@@ -31,7 +31,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumar8j@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SE:HB
 //------------------------------------------------------------------------------
 
@@ -148,7 +148,7 @@ fapi2::ReturnCode p9_start_cbs(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>
                 .set_MASTER_CHIP(i_target_chip)
                 .set_CBS_CS_READ(l_data32_cbs_cs)
                 .set_CBS_CS_IDLE_VALUE(CBS_IDLE_VALUE)
-                .set_LOOP_COUNT(l_timeout)
+                .set_LOOP_COUNT(P9_CFAM_CBS_POLL_COUNT)
                 .set_HW_DELAY(P9_CBS_IDLE_HW_NS_DELAY),
                 "ERROR: CBS HAS NOT REACHED IDLE STATE VALUE 0x002 ");
 
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.H b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.H
index bd8878aef1a..54469e40a39 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -31,7 +31,7 @@
 // *HWP HW Backup Owner : Srinivas V Naga <srinivan@in.ibm.com>
 // *HWP FW Owner        : sunil kumar <skumar8j@in.ibm.com>
 // *HWP Team            : Perv
-// *HWP Level           : 2
+// *HWP Level           : 3
 // *HWP Consumed by     : SE:HB
 //------------------------------------------------------------------------------
 
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml
index 0bcc75f03d0..7753b4523d4 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_start_cbs_errors.xml
@@ -29,9 +29,8 @@
 <hwpErrors>
   <!-- ******************************************************************** -->
     <hwpError>
-      <sbeError/>
       <rc>RC_CBS_NOT_IN_IDLE_STATE</rc>
-      <description>CBS is not in IDLE state</description>
+      <description>CBS did not complete (did not arrive in IDLE state) within timeout</description>
       <collectFfdc>p9_pib2pcb_mux_seq, MASTER_CHIP_TARGET</collectFfdc>
       <collectRegisterFfdc>
         <id>ROOT_CTRL_REGISTERS_CFAM</id>
@@ -57,12 +56,21 @@
       <ffdc>CBS_CS_IDLE_VALUE</ffdc>
       <ffdc>LOOP_COUNT</ffdc>
       <ffdc>HW_DELAY</ffdc>
+      <callout>
+        <target>MASTER_CHIP</target>
+        <priority>HIGH</priority>
+      </callout>
+      <deconfigure>
+        <target>MASTER_CHIP</target>
+      </deconfigure>
+      <gard>
+        <target>MASTER_CHIP</target>
+      </gard>
     </hwpError>
   <!-- ******************************************************************** -->
     <hwpError>
-      <sbeError/>
       <rc>RC_VDN_PGOOD_NOT_SET</rc>
-      <description>VDN_PGOOD not set to 1</description>
+      <description>Nest power (VDN) Power Good indication not set</description>
       <collectFfdc>p9_pib2pcb_mux_seq, MASTER_CHIP</collectFfdc>
       <collectRegisterFfdc>
         <id>ROOT_CTRL_REGISTERS_CFAM</id>
@@ -85,12 +93,29 @@
         <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <ffdc>CBS_ENVSTAT_READ</ffdc>
+      <callout>
+        <!-- Call out the processor VRM -->
+        <hw>
+          <hwid>SPIVID_SLAVE_PART</hwid>
+          <refTarget>MASTER_CHIP</refTarget>
+        </hw>
+        <priority>HIGH</priority>
+      </callout>
+      <callout>
+        <target>MASTER_CHIP</target>
+        <priority>MEDIUM</priority>
+      </callout>
+      <deconfigure>
+        <target>MASTER_CHIP</target>
+      </deconfigure>
+      <gard>
+        <target>MASTER_CHIP</target>
+      </gard>
     </hwpError>
   <!-- ******************************************************************** -->
     <hwpError>
-      <sbeError/>
       <rc>RC_VDD_NEST_OBSERVE_NOT_SET</rc>
-      <description>VDD bit not set</description>
+      <description>Nest power (VDN) observe bit not set</description>
       <collectFfdc>p9_pib2pcb_mux_seq, MASTER_CHIP</collectFfdc>
       <collectRegisterFfdc>
         <id>ROOT_CTRL_REGISTERS_CFAM</id>
@@ -113,6 +138,24 @@
         <targetType>TARGET_TYPE_PROC_CHIP</targetType>
       </collectRegisterFfdc>
       <ffdc>FSI2PIB_STATUS_READ</ffdc>
+      <callout>
+        <hw>
+          <!-- Call out the processor VRM -->
+          <hwid>SPIVID_SLAVE_PART</hwid>
+          <refTarget>MASTER_CHIP</refTarget>
+        </hw>
+        <priority>HIGH</priority>
+      </callout>
+      <callout>
+        <target>MASTER_CHIP</target>
+        <priority>MEDIUM</priority>
+      </callout>
+      <deconfigure>
+        <target>MASTER_CHIP</target>
+      </deconfigure>
+      <gard>
+        <target>MASTER_CHIP</target>
+      </gard>
     </hwpError>
   <!-- ******************************************************************** -->
     <hwpError>