Index: firmware/App/Controllers/Bubble.c
===================================================================
diff -u -r37a9fd8f15e413db5337371a7d1a1cb65567af7c -rba4b62be88b1a12ff5cd9cc68624302fe4f608a4
--- firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
+++ firmware/App/Controllers/Bubble.c	(.../Bubble.c)	(revision ba4b62be88b1a12ff5cd9cc68624302fe4f608a4)
@@ -210,17 +210,11 @@
                         case TREATMENT_BLOOD_PRIME_STATE:
                         case TREATMENT_DIALYSIS_STATE:
                         case TREATMENT_END_STATE:
-                            if ( bubble == ADV )
-                            {
-                                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
-                            }
+                            activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
                             break;
 
                         case TREATMENT_RINSEBACK_STATE:
-                            if ( bubble == ADV )
-                            {
-                                activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
-                            }
+                            activateAlarmNoData( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
                             break;
 
                         default:
@@ -231,11 +225,8 @@
             }
             else // Air bubble not detected
             {
-                if ( bubble == ADV )
-                {
-                    clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
-                    clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
-                }
+                clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED );
+                clearAlarmCondition( ALARM_ID_HD_VENOUS_BUBBLE_DETECTED_RINSEBACK );
             }
         }
 
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -ra49d4033363206fc3ae86d8648eb5b9cc91e8dca -rba4b62be88b1a12ff5cd9cc68624302fe4f608a4
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision a49d4033363206fc3ae86d8648eb5b9cc91e8dca)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision ba4b62be88b1a12ff5cd9cc68624302fe4f608a4)
@@ -265,17 +265,21 @@
         // Don't interrupt pump control unless rate or mode is changing
         if ( ( fabs( pwmDC - dialOutPumpPWMDutyCyclePct ) > NEARLY_ZERO ) || ( mode != dialOutPumpControlMode ) )
         {
+#ifndef _RELEASE_
             BOOL byPassFlowLimit = FALSE;
 
-#ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMPS_FLOW_LIMITS ) )
             {
                 byPassFlowLimit = TRUE;
             }
 #endif
 
             // Verify flow rate
+#ifdef _RELEASE_
+            if ( flowRate <= MAX_DIAL_OUT_FLOW_RATE )
+#else
             if ( ( flowRate <= MAX_DIAL_OUT_FLOW_RATE ) || ( TRUE == byPassFlowLimit ) )
+#endif
             {
                 resetDialOutFlowMovingAverage();
                 dopControlSignal = FALSE;
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -r29b362c485f28f45ef367342ac895e1c1907ac45 -rba4b62be88b1a12ff5cd9cc68624302fe4f608a4
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision ba4b62be88b1a12ff5cd9cc68624302fe4f608a4)
@@ -338,7 +338,7 @@
  *************************************************************************/
 static void setInletFansDutyCycle( F32 pwm )
 {
-    etpwmSetCmpA( etpwmREG7, (U32)( (S32)( ( pwm * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+    etpwmSetCmpA( etpwmREG7, (U32)( (S32)( ( pwm * (F32)(etpwmREG7->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
 }
 
 /*********************************************************************//**
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -rba4b62be88b1a12ff5cd9cc68624302fe4f608a4
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision ba4b62be88b1a12ff5cd9cc68624302fe4f608a4)
@@ -338,15 +338,14 @@
             else
             {
                 generateStopCondition();
-                if ( commFaultPersistentCount++ > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
+                if ( ++commFaultPersistentCount > BATTERY_COMM_FAULT_PERSISTENTCE_COUNT )
                 {
 #ifndef DISABLE_BATT_COMM
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BATTERY_COMM_FAULT, slaveAddr );
 #endif
                 }
             }
         }
-
     }
 
     if ( FALSE == result )