Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r7cd8a5523de307f514f6c84df29dc7bc72c6a0e4 -r9d47686ad2c50ef3fa69aa9cb0b152d250bfb3d2
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7cd8a5523de307f514f6c84df29dc7bc72c6a0e4)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9d47686ad2c50ef3fa69aa9cb0b152d250bfb3d2)
@@ -785,7 +785,7 @@
 
     if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {
-        F32 acidCondUSPerCM      = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_ACID_TEST ].acidConduSPerCM;
+        F32 acidCondUSPerCM      = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_ACID_TEST ].bicarbConduSPerCM;
         BOOL hasAcidTestPassed   = FALSE;
 
         averageBicarbConductivity = totalBicarbConductivity / bicarbConductivitySampleCount;
Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -r84989e158824d6cc8d8747ca80c6419315cc951c -r9d47686ad2c50ef3fa69aa9cb0b152d250bfb3d2
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 84989e158824d6cc8d8747ca80c6419315cc951c)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 9d47686ad2c50ef3fa69aa9cb0b152d250bfb3d2)
@@ -498,7 +498,6 @@
     {
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, initialReservoirWeight, reservoirWeight );
     }
-
 }
 
 /*********************************************************************//**