Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r5eda37efda2d771de4f5cfb509adf05621a290c3 -rd3142d47c87c30968bda8f2a0a6759b40cc72711
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 5eda37efda2d771de4f5cfb509adf05621a290c3)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision d3142d47c87c30968bda8f2a0a6759b40cc72711)
@@ -1188,7 +1188,7 @@
  * @details
  * Inputs : none
  * Outputs : dialOutDataPublishInterval
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutPumpAndLoadCellDataPublishIntervalOverride( void )
 {
@@ -1292,7 +1292,7 @@
  * @details
  * Inputs : referenceUFVolumeInMl
  * Outputs : referenceUFVolumeInMl
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutUFRefVolumeOverride( void )
 {
@@ -1339,7 +1339,7 @@
  * @details
  * Inputs : totalMeasuredUFVolumeInMl
  * Outputs : totalMeasuredUFVolumeInMl
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetDialOutUFTotVolumeOverride( void )
 {
@@ -1386,7 +1386,7 @@
  * @details
  * Inputs : DialOutPumpRotorSpeedRPM
  * Outputs : DialOutPumpRotorSpeedRPM
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpRotorSpeedOverride( void )
 {
@@ -1433,7 +1433,7 @@
  * @details
  * Inputs : dialOutPumpSpeedRPM
  * Outputs : dialOutPumpSpeedRPM
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpSpeedOverride( void )
 {
@@ -1480,7 +1480,7 @@
  * @details
  * Inputs : dialOutPumpMCSpeedRPM
  * Outputs : dialOutPumpMCSpeedRPM
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpMCSpeedOverride( void )
 {
@@ -1527,7 +1527,7 @@
  * @details
  * Inputs : dialOutPumpMCCurrentmA
  * Outputs : dialOutPumpMCCurrentmA
- * @return TRUE if reset reset successful, FALSE if not
+ * @return TRUE if reset override successful, FALSE if not
  *************************************************************************/
 BOOL testResetMeasuredDialOutPumpMCCurrentOverride( void )
 {
Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rde169e7374f6c7a737995ac8c6c3953dc5c75aa7 -rd3142d47c87c30968bda8f2a0a6759b40cc72711
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision de169e7374f6c7a737995ac8c6c3953dc5c75aa7)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision d3142d47c87c30968bda8f2a0a6759b40cc72711)
@@ -633,7 +633,7 @@
 #endif
     }
     // if actively performing ultrafiltration right now, increment timer and see if time to start another 1 hour check period
-    if ( ( DIALYSIS_UF_STATE == currentDialysisState ) && ( UF_RUNNING_STATE == currentUFState ) )
+    if ( UF_RUNNING_STATE == currentUFState )
     {
         if ( ++uFAccuracyCheckTimerCtr >= UF_ACCURACY_CHECK_INTERVAL )
         {
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r194cc4e5fbe048bd60b137c33e68e96a1ae39dc5 -rd3142d47c87c30968bda8f2a0a6759b40cc72711
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 194cc4e5fbe048bd60b137c33e68e96a1ae39dc5)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision d3142d47c87c30968bda8f2a0a6759b40cc72711)
@@ -1027,8 +1027,8 @@
 void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab )
 {
     *Id = fpgaHeader.fpgaId;
-    *Maj = fpgaHeader.fpgaRev;
-    *Min = fpgaHeader.fpgaRevMajor;
+    *Min = fpgaHeader.fpgaRev;
+    *Maj = fpgaHeader.fpgaRevMajor;
     *Lab = fpgaHeader.fpgaRevLab;
 }