Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r773bd9e1eebab013afa0b303231be73e8016c84c -r595c1cef4ae603e74d003a6abf7d71168fb0e66d
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 773bd9e1eebab013afa0b303231be73e8016c84c)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 595c1cef4ae603e74d003a6abf7d71168fb0e66d)
@@ -247,7 +247,8 @@
             setThisFisrtFillFlag( TRUE );                                 // indicates bottles need prime
             activateAlarmNoData( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME );    // trigger empty acid bottle alarm
         }
-        else if ( TRUE == isEmptyBicarbBottle() )
+
+        if ( TRUE == isEmptyBicarbBottle() )
         {
             setThisFisrtFillFlag( TRUE );
             activateAlarmNoData( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME );
@@ -264,7 +265,7 @@
     }
 
     // Drain timed out raise the alarm
-    if ( TRUE == didTimeout( dialysateDrainStartTime, DIALYSATE_DRAIN_TIME_OUT ) )
+    else if ( TRUE == didTimeout( dialysateDrainStartTime, DIALYSATE_DRAIN_TIME_OUT ) )
     {
         activateAlarmNoData( ALARM_ID_DG_DIALYSATE_DRAIN_TIME_OUT );
     }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r773bd9e1eebab013afa0b303231be73e8016c84c -r595c1cef4ae603e74d003a6abf7d71168fb0e66d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 773bd9e1eebab013afa0b303231be73e8016c84c)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 595c1cef4ae603e74d003a6abf7d71168fb0e66d)
@@ -826,7 +826,6 @@
 {
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_PAUSED;
 
-
     if ( FALSE == isAlarmActive( ALARM_ID_DG_BAD_INLET_WATER_QUALITY ) )
     {
         result = DG_FILL_MODE_STATE_TEST_INLET_WATER;