Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -re86b330049966e34035f03496e40f22e6bd4e5a9 -r2ed28d3fdc3345c4a3d8f1684d1541f2a27467d8
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision e86b330049966e34035f03496e40f22e6bd4e5a9)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 2ed28d3fdc3345c4a3d8f1684d1541f2a27467d8)
@@ -700,8 +700,8 @@
         {
             bloodLeakSelfTestStatus = SELF_TEST_STATUS_FAILED;
             state                   = BLOOD_LEAK_INIT_STATE;
+            SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, bloodLeakSelfTestStatus, state )
         }
-        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, bloodLeakSelfTestStatus, state )
     }
 
     return state;
@@ -739,6 +739,7 @@
                state = BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE;
            }
        }
+       SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT, bloodLeakSelfTestStatus, state )
     }
 
     return state;
@@ -917,7 +918,7 @@
 {
     BOOL status           = FALSE;
     BOOL isZeroingNeeded  = TRUE;
-    U32 setPoint          = bloodLeakEmbModeCmd[ SP_EMB_MODE_CMD ].commandResp;
+    U32 setPoint          = bloodLeakEmbModeCmd[ D_EMB_MODE_CMD ].commandResp;
     F32 driftMinFromTop   = BLD_NOMINAL_INTENSITY - ( setPoint * BLD_MAX_INTENSITY_OUT_OF_RANGE );
     F32 driftMaxFromTop   = BLD_NOMINAL_INTENSITY - ( setPoint * BLD_MIN_INTENSITY_OUT_OF_RANGE );
     BOOL isZeroingAllowed = didTimeout( bloodLeakZeroingStatus.lastZeroingStartTimeMS, BLD_ZERO_MIN_INTERVAL_MS );
@@ -932,6 +933,7 @@
 
     if ( ( TRUE == isZeroingAllowed ) && ( TRUE == didTimeout( bloodLeakZeroingStatus.driftInRangeStartTimeMS, BLD_ZERO_IN_RANGE_DRIFT_TIMEOUT_MS ) ) )
     {
+        SEND_EVENT_WITH_2_F32_DATA( HD_EVENT_BLOOD_LEAK_DRIFT_IN_RANGE, driftMinFromTop, driftMaxFromTop )
         status = TRUE;
     }