diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C
index 1d29a693b56..c15b5bb03dd 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/workarounds/dp16_workarounds.C
@@ -513,8 +513,7 @@ fapi2::ReturnCode dqs_align_workaround(const fapi2::Target<fapi2::TARGET_TYPE_MC
                  .set_NUM_LOOPS(l_num_loops)
                  .set_RP(i_rp)
                  .set_ABORT_ON_ERROR(i_abort_on_error)
-                 .set_TARGET_WITH_REGISTERS(i_target)
-                 .set_TARGET_WITH_REGISTERS(i_target),
+                 .set_MCA_TARGET(i_target),
                  "%s i_rp %lu DQS workaround failed! 10 loops reached without everything passing",
                  mss::c_str(i_target), i_rp);
 
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
index e10fd944938..435c3c1f958 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_draminit_training.xml
@@ -209,21 +209,21 @@
   <ffdc>ABORT_ON_ERROR</ffdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_FAILURE_DISABLE_REGS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <collectRegisterFfdc>
     <id>REG_FFDC_MSS_DRAMINIT_TRAINING_ERROR_STATUS</id>
-    <target>TARGET_WITH_REGISTERS</target>
+    <target>MCA_TARGET</target>
     <targetType>TARGET_TYPE_MCA</targetType>
   </collectRegisterFfdc>
   <callout>
-    <target>TARGET_IN_ERROR</target>
-    <priority>LOW</priority>
+    <target>MCA_TARGET</target>
+    <priority>HIGH</priority>
   </callout>
   <callout>
     <procedure>CODE</procedure>
-    <priority>HIGH</priority>
+    <priority>MEDIUM</priority>
   </callout>
 </hwpError>