Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -r59db8aee013909ad99e034b638b27e16a2d88df7 -r98bd6dd355e8736e020b3900ca971120c26ad8a6
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision 59db8aee013909ad99e034b638b27e16a2d88df7)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision 98bd6dd355e8736e020b3900ca971120c26ad8a6)
@@ -331,7 +331,7 @@
     if ( TRUE == isTestingActivated() )
     {
         // Verify payload length is valid
-        if ( sizeof( U32 ) + sizeof( F32 ) == message->hdr.payloadLen )
+        if ( sizeof( AIR_PUMP_SET_CMD_PAYLOAD_T ) == message->hdr.payloadLen )
         {
             U08 *msgPayload = &message->payload[0];
             AIR_PUMP_SET_CMD_PAYLOAD_T payload;
Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r59db8aee013909ad99e034b638b27e16a2d88df7 -r98bd6dd355e8736e020b3900ca971120c26ad8a6
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 59db8aee013909ad99e034b638b27e16a2d88df7)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 98bd6dd355e8736e020b3900ca971120c26ad8a6)
@@ -260,8 +260,9 @@
  * @details \b Alarm: ALARM_ID_TD_REPEATED_AIR_TRAP_LOWER_EVENTS,
  * ALARM_ID_TD_AIR_TRAP_FILL_DURING_TREATMENT,  if air trap
  * fill exceeds maximum allowed time to complete.
- * @details \b Inputs: airTrapControllerState, fillStartTime
- * @details \b Outputs: none
+ * @details \b Inputs: airTrapControllerState, fillStartTime,
+ * airTrapLowerEventCount, airTrapLowerEventStartTime
+ * @details \b Outputs: airTrapLowerEventCount, airTrapLowerEventStartTime
  * @return none
  *************************************************************************/
 void execAirTrapMonitorTreatment( void )
Index: firmware/App/Drivers/GLXferPump.c
===================================================================
diff -u -r59db8aee013909ad99e034b638b27e16a2d88df7 -r98bd6dd355e8736e020b3900ca971120c26ad8a6
--- firmware/App/Drivers/GLXferPump.c	(.../GLXferPump.c)	(revision 59db8aee013909ad99e034b638b27e16a2d88df7)
+++ firmware/App/Drivers/GLXferPump.c	(.../GLXferPump.c)	(revision 98bd6dd355e8736e020b3900ca971120c26ad8a6)
@@ -72,12 +72,12 @@
  *************************************************************************/
 void setAirPumpMotorPower( F32 power )
 {
-    scalarPowerLevel = convertPercentageToScalar( power );
+    U08 scalarPower = scalarPowerLevel = convertPercentageToScalar( power );
 
     // if state is changing, set the air pump to the given on/off state and send event
     if ( power != currentAirPumpMotorPowerLevel )
     {
-        setH12AirPumpMotorPowerLevel( scalarPowerLevel );
+        setH12AirPumpMotorPowerLevel( scalarPower );
         SEND_EVENT_WITH_2_F32_DATA( TD_EVENT_AIR_PUMP_ON_OFF, currentAirPumpMotorPowerLevel, power );
         currentAirPumpMotorPowerLevel = power;
     }