Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r974df7d9f041fac87788c400220e9e049f25ea7e -rf9a866abfc44db38c01cb795fea894cce1042eec
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 974df7d9f041fac87788c400220e9e049f25ea7e)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision f9a866abfc44db38c01cb795fea894cce1042eec)
@@ -527,9 +527,8 @@
 static BLOOD_LEAK_STATE_T handleBloodLeakCheckZeroAndSelfTestState( void )
 {
     U08 i;
-    BLOOD_LEAK_STATE_T state          = BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE;
-    BOOL areCommandsReady             = TRUE;
-    bloodLeakEmbModeHasZeroBeenRqustd = FALSE;
+    BLOOD_LEAK_STATE_T state = BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE;
+    BOOL areCommandsReady    = TRUE;
 
     for ( i = 0; i < NUM_OF_EMB_CMDS; i++ )
     {
@@ -578,6 +577,7 @@
         {
             // Done with zero sequence, transition to other states
             bloodLeakEmbModeCmd[ Z_EMB_MODE_CMD ].commandRetryCount = 0;
+            bloodLeakEmbModeHasZeroBeenRqustd                       = FALSE;
             bloodLeakSelfTestStatus                                 = SELF_TEST_STATUS_PASSED;
             state                                                   = BLOOD_LEAK_NORMAL_STATE;
         }
@@ -1364,7 +1364,7 @@
  *************************************************************************/
 static U08 dequeueEmbModeCmd( void )
 {
-    U08 command;
+    U08 command = 0;
     U08 tempIndex;
 
     _disable_IRQ();