Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rd4e5e5e155cd938823ee8eb8b090355e1fcc37a2 -r41c7186ac17200977b632102c9c6e3a07b3eb211
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d4e5e5e155cd938823ee8eb8b090355e1fcc37a2)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 41c7186ac17200977b632102c9c6e3a07b3eb211)
@@ -216,9 +216,11 @@
  *************************************************************************/
 void checkRORejectionRatio( void )
 {
+#ifndef DISABLE_DIALYSATE_CHECK
     F32 const cpo = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
     BOOL const isRORejectionRatioOutOfRange = ( roRejectionRatio > MAX_RO_REJECTION_RATIO_ALLOW ) || ( cpo >= MAX_CPO_CONDUCTIVITY_ALLOW );
     checkPersistentAlarm( PERSISTENT_ALARM_RO_REJECTION_RATIO_OUT_OF_RANGE, isRORejectionRatioOutOfRange, roRejectionRatio );
+#endif
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r28a4756da770f48c81ab421135c2012550705c74 -r41c7186ac17200977b632102c9c6e3a07b3eb211
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 28a4756da770f48c81ab421135c2012550705c74)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 41c7186ac17200977b632102c9c6e3a07b3eb211)
@@ -521,7 +521,9 @@
 {
     BOOL isADCValid = FALSE;
 #ifndef _VECTORCAST_
-    isADCValid = TRUE; // TODO remove this line. Temporary set to true until FPGA error count is fixed
+    // TODO remove these two lines. Temporary set to true until FPGA error count is fixed
+    isADCValid = TRUE;
+    fpgaError = 0;
 #endif
     if ( fpgaError == 0 )
     {
@@ -536,7 +538,8 @@
             ++tempSensors[ sensorIndex ].internalErrorCount;
             if ( tempSensors[ sensorIndex ].internalErrorCount > MAX_ALLOWED_UNCHANGED_ADC_READS )
             {
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TEMPERATURE_SENSORS_FAULT, sensorIndex );
+                // TODO: Add back alarm when temperature sensor read count is stable
+                // SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TEMPERATURE_SENSORS_FAULT, sensorIndex );
             }
         }
     }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r88fdd83b43ef9c2d2f06a51e555db1439b668921 -r41c7186ac17200977b632102c9c6e3a07b3eb211
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 88fdd83b43ef9c2d2f06a51e555db1439b668921)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 41c7186ac17200977b632102c9c6e3a07b3eb211)
@@ -217,7 +217,7 @@
     BOOL isDialysateConductivityBad = ( isAlarmActive( ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE ) || isAlarmActive( ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE ) );
 
 #ifdef DISABLE_DIALYSATE_CHECK
-    isInletWaterReady = TRUE;
+    isDialysateConductivityBad = FALSE;
 #endif
 
     // TODO - transition back when temperature or mix out of range
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2f8e714f10caf424aee79db467b030e90fa8571b -r41c7186ac17200977b632102c9c6e3a07b3eb211
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2f8e714f10caf424aee79db467b030e90fa8571b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 41c7186ac17200977b632102c9c6e3a07b3eb211)
@@ -1899,7 +1899,7 @@
     DG_OP_MODE_T mode;
 
     // verify payload length
-    if ( sizeof( DG_OP_MODE_T ) == message->hdr.payloadLen )
+    if ( sizeof( U32 ) == message->hdr.payloadLen )
     {
         if ( TRUE == isTestingActivated() )
         {