diff --git a/src/include/usr/ipmi/ipmisensor.H b/src/include/usr/ipmi/ipmisensor.H
index aa76518d1d2..761e103301f 100644
--- a/src/include/usr/ipmi/ipmisensor.H
+++ b/src/include/usr/ipmi/ipmisensor.H
@@ -1069,7 +1069,7 @@ namespace SENSOR
      *      maintained by the BMC.
      *
      *   Usage:
-     *      uint8_t key_clear_request_value = 0x0100;
+     *      uint8_t key_clear_request_value = 0x01; //MSByte of Key Clear value
      *      KeyClearRequestSensor l_sensor;
      *      l_sensor.setKeyClearRequestValue( key_clear_request_value );
      *
diff --git a/src/usr/ipmiext/ipmisensor.C b/src/usr/ipmiext/ipmisensor.C
index 3c96fdbc956..a158500f339 100644
--- a/src/usr/ipmiext/ipmisensor.C
+++ b/src/usr/ipmiext/ipmisensor.C
@@ -1035,7 +1035,7 @@ namespace SENSOR
     //
     errlHndl_t KeyClearRequestSensor::setKeyClearRequest(const uint8_t i_value)
     {
-        // This is a threshhhold sensor that sets one byte of data in the
+        // This is a threshold sensor that sets one byte of data in the
         // iv_sensor_reading field
         iv_msg->iv_sensor_reading = i_value;
 
@@ -1047,7 +1047,7 @@ namespace SENSOR
     //
     errlHndl_t KeyClearRequestSensor::getKeyClearRequest( uint8_t &o_value )
     {
-        // This is a threshhhold sensor that returns one byte of data in
+        // This is a threshold sensor that returns one byte of data in
         // the sensor_status field
         getSensorReadingData l_data;
 
diff --git a/src/usr/isteps/istep06/call_host_update_master_tpm.C b/src/usr/isteps/istep06/call_host_update_master_tpm.C
index 6a81c4ee100..dea17f4b108 100644
--- a/src/usr/isteps/istep06/call_host_update_master_tpm.C
+++ b/src/usr/isteps/istep06/call_host_update_master_tpm.C
@@ -80,6 +80,7 @@ void* call_host_update_master_tpm( void *io_pArgs )
                    TRACE_ERR_FMT,
                    TRACE_ERR_ARGS(l_err));
         l_stepError.addErrorDetails(l_err);
+        ERRORLOG::errlCommit( l_err, SECURE_COMP_ID );
     }
 #endif
 
diff --git a/src/usr/secureboot/ext/phys_presence.C b/src/usr/secureboot/ext/phys_presence.C
index 203fa84c97d..9e5400f2efd 100644
--- a/src/usr/secureboot/ext/phys_presence.C
+++ b/src/usr/secureboot/ext/phys_presence.C
@@ -125,15 +125,15 @@ errlHndl_t detectPhysPresence(void)
                TRACE_ERR_FMT,
                TRACE_ERR_ARGS(err));
 
-        err->collectTrace(SECURE_COMP_NAME);
         break;
     }
 
     // Get the attribute with the needed GPIO information
     if (mproc->tryGetAttr<ATTR_GPIO_INFO_PHYS_PRES>(gpioInfo))
     {
-        SB_INF("detectPhysPresence: gpioInfo: e%d/p%d/devAddr=0x%X, "
-               "windowOpenPin=%d, physPresPin=%d",
+        SB_INF("detectPhysPresence: gpioInfo: mproc=0x%0.8X "
+               "e%d/p%d/devAddr=0x%X, windowOpenPin=%d, physPresPin=%d",
+               get_huid(mproc),
                gpioInfo.engine, gpioInfo.port, gpioInfo.devAddr,
                gpioInfo.windowOpenPin, gpioInfo.physicalPresencePin);
     }
@@ -161,7 +161,6 @@ errlHndl_t detectPhysPresence(void)
                             ATTR_GPIO_INFO_PHYS_PRES,
                             ErrlEntry::ADD_SW_CALLOUT);
 
-        err->collectTrace( SECURE_COMP_NAME );
         break;
     }
 
@@ -313,7 +312,6 @@ errlHndl_t detectPhysPresence(void)
                        "there was no key clear request: "
                        TRACE_ERR_FMT,
                        TRACE_ERR_ARGS(err_close));
-                err_close->collectTrace( SECURE_COMP_NAME );
             }
 
             if (err)
@@ -333,7 +331,6 @@ errlHndl_t detectPhysPresence(void)
                 SB_ERR("detectPhysPresence: Error in closing window. "
                        TRACE_ERR_FMT,
                        TRACE_ERR_ARGS(err));
-                err_close->collectTrace( SECURE_COMP_NAME );
                 err = err_close;
                 err_close = nullptr;
             }
@@ -363,6 +360,10 @@ errlHndl_t detectPhysPresence(void)
          errlCommit(err, SECURE_COMP_ID);
          err = nullptr;
     }
+    else if (err != nullptr)
+    {
+        err->collectTrace( SECURE_COMP_NAME );
+    }
 
     SB_EXIT("detectPhysPresence: err rc=0x%X",
             ERRL_GETRC_SAFE(err));
@@ -504,8 +505,6 @@ errlHndl_t handlePhysPresenceWindow(void)
                "failed.  "
                TRACE_ERR_FMT,
                TRACE_ERR_ARGS(err));
-
-        err->collectTrace(SECURE_COMP_NAME);
         break;
     }
 
@@ -520,6 +519,13 @@ errlHndl_t handlePhysPresenceWindow(void)
                               (led_window_open),
                             PCA9551_OUTPUT_LOW,
                             led_data);
+    if(err)
+    {
+        SB_ERR("handlePhysPresenceWindow: call to gpioPca9551SetLed failed. "
+               TRACE_ERR_FMT,
+               TRACE_ERR_ARGS(err));
+        break;
+    }
 
     // Verify that the "window open" LED is set
     // LEDs/PINs represent "WINDOW_OPEN_N" and "PHYS_PRESENCE_N" so need
@@ -560,7 +566,6 @@ errlHndl_t handlePhysPresenceWindow(void)
                           led_window_open),
                       ErrlEntry::ADD_SW_CALLOUT);
 
-        err->collectTrace( SECURE_COMP_NAME );
         break;
     }
 
@@ -618,6 +623,7 @@ errlHndl_t handlePhysPresenceWindow(void)
                    "attributes to FSP. "
                    TRACE_ERR_FMT,
                    TRACE_ERR_ARGS(err));
+            err->collectTrace( SECURE_COMP_NAME );
             errlCommit(err,SECURE_COMP_ID );
         }
     }
@@ -662,6 +668,10 @@ errlHndl_t handlePhysPresenceWindow(void)
          errlCommit(err, SECURE_COMP_ID);
          err = nullptr;
     }
+    else if (err != nullptr)
+    {
+        err->collectTrace( SECURE_COMP_NAME );
+    }
 
     SB_EXIT("handlePhysPresenceWindow: err_rc=0x%X",
             ERRL_GETRC_SAFE(err));