diff --git a/src/occ_405/amec/amec_slave_smh.c b/src/occ_405/amec/amec_slave_smh.c
index 4c68e0b0..03b1dab7 100755
--- a/src/occ_405/amec/amec_slave_smh.c
+++ b/src/occ_405/amec/amec_slave_smh.c
@@ -236,7 +236,7 @@ void amec_slv_check_apss_fail(void)
     Pstate      l_pstate = 0;
     static bool L_lower_pmax_rail = FALSE;
     static bool L_raise_pmax_rail = TRUE;
-    int         rc = 0;
+
     /*------------------------------------------------------------------------*/
     /*  Code                                                                  */
     /*------------------------------------------------------------------------*/
@@ -264,7 +264,7 @@ void amec_slv_check_apss_fail(void)
                     // There is no Pmax "rail" in P9, just set clips via PGPE
                     l_pstate = proc_freq2pstate(l_pmax_rail_freq);
                     TRAC_INFO("amec_slv_check_apss_fail: attempting to lower Pstate to nominal");
-                    rc = pgpe_set_clip_ranges(l_pstate);
+                    pgpe_set_clip_ranges(l_pstate);
                 }
 
                 L_lower_pmax_rail = TRUE;
@@ -285,7 +285,7 @@ void amec_slv_check_apss_fail(void)
                     // Set the Pmax clip via PGPE
                     l_pstate = proc_freq2pstate(l_pmax_rail_freq);
                     TRAC_INFO("amec_slv_check_apss_fail: attempting to raise Pstate to fmax");
-                    rc = pgpe_set_clip_ranges(l_pstate);
+                    pgpe_set_clip_ranges(l_pstate);
                 }
 
                 L_lower_pmax_rail = FALSE;
diff --git a/src/occ_405/pss/avsbus.c b/src/occ_405/pss/avsbus.c
index c668c365..da746b9b 100644
--- a/src/occ_405/pss/avsbus.c
+++ b/src/occ_405/pss/avsbus.c
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER OnChipController Project                                     */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -237,29 +237,34 @@ void avsbus_read_start(const avsbus_type_e i_type,
     avsbusData_t l_data;
 
     // Create error array for each type (Vdd/Vdn) and command (Voltage/Current)
+    if (AVSBUS_VDD == i_type)
+    {
+        l_data = G_sysConfigData.avsbus_vdd;
+    }
+    else
+    {
+        l_data = G_sysConfigData.avsbus_vdn;
+    }
+
+#ifdef AVSDEBUG
     uint8_t l_cmd_index = 0;
     char l_trace_cmd = 'V';
+    char l_trace_type = 'd';
+
     if (i_cmdtype == AVSBUS_CURRENT)
     {
         l_cmd_index = 1;
         l_trace_cmd = 'C';
     }
-
-    char l_trace_type = 'd';
-    if (AVSBUS_VDD == i_type)
+    if (AVSBUS_VDD != i_type)
     {
-        l_data = G_sysConfigData.avsbus_vdd;
-    }
-    else
-    {
-        l_data = G_sysConfigData.avsbus_vdn;
         l_trace_type = 'n';
     }
 
-#ifdef AVSDEBUG
     static uint32_t L_trace_count[ERRORCOUNT_MAXTYPES][ERRORCOUNT_MAXCMDS] = {{0}};
     uint32_t *      l_trace_count = &L_trace_count[i_type][l_cmd_index];
     uint32_t DEBUG_TRACE_MAX = 2;
+
     if (*l_trace_count < DEBUG_TRACE_MAX)
     {
         TRAC_INFO("avsbus_read_start: Vd%c %c - bus[%d] rail[%d]",
diff --git a/src/occ_405/state.c b/src/occ_405/state.c
index ec6eb55e..c7d931eb 100755
--- a/src/occ_405/state.c
+++ b/src/occ_405/state.c
@@ -373,7 +373,7 @@ errlHndl_t SMGR_all_to_standby()
 
     } while (0);
 
-    if(l_errlHndl)
+    if(l_errlHndl && !l_error_logged)
     {
         l_error_logged = TRUE;
         TRAC_ERR("SMGR: Transition to Standby Failed");
@@ -448,7 +448,7 @@ errlHndl_t SMGR_characterization_to_observation()
         }
     } while (0);
 
-    if(rc)
+    if(rc && !l_error_logged)
     {
         l_error_logged = TRUE;
         TRAC_ERR("SMGR: Characterization to Observation Transition Failed");