Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -ra8eecf939bc9baff3d5ff5e87013297b8fe20d0e
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 22176ce95e49213c48454f34ddf5d29b8109f2cb)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision a8eecf939bc9baff3d5ff5e87013297b8fe20d0e)
@@ -153,7 +153,6 @@
     setFPGACPoProbeType( COND_CPO_SENSOR_PROBE_TYPE );
 
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS );
-    initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD );
     initPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, RO_REJECTION_RATIO_PERSISTENCE_PERIOD, RO_REJECTION_RATIO_PERSISTENCE_PERIOD );
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r5fb0cfdde0e308edfa027fc10981655c329abf4a -ra8eecf939bc9baff3d5ff5e87013297b8fe20d0e
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 5fb0cfdde0e308edfa027fc10981655c329abf4a)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision a8eecf939bc9baff3d5ff5e87013297b8fe20d0e)
@@ -117,12 +117,12 @@
             {
                 if (CONCENTRATE_CAP == i)
                 {
-                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_CONCENTRATECAP_SWITCH_CHANGE,
+                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE,
                                                 (U32)switchesStatus[ i ].status.data, (U32)currentSwitchStatus );
                 }
                 else if (DIALYSATE_CAP == i)
                 {
-                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_DIALYSATECAP_SWITCH_CHANGE,
+                    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE,
                                                 (U32)switchesStatus[ i ].status.data, (U32)currentSwitchStatus );
                 }
                 switchesStatus[ i ].debounceStartTime = 0;