Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r7f3bf72c038de385e8a0d743990069c039e13ba0 -r143f7b732efbb9efdc690757823e711b5022b29d
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 7f3bf72c038de385e8a0d743990069c039e13ba0)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 143f7b732efbb9efdc690757823e711b5022b29d)
@@ -363,7 +363,7 @@
  *************************************************************************/
 static AIR_TRAP_STATE_T handleAirTrapManualControlState( void )
 {
-    AIR_TRAP_STATE_T result = AIR_TRAP_MANUAL_CONTROL_STATE;
+    AIR_TRAP_STATE_T result = e;
 
     // Transition to valve control states when requested
     if ( TRUE == pendingStartAirTrapController )
Index: firmware/App/Drivers/BPDriver.c
===================================================================
diff -u -r3a4d8c5c7ca884827801433839080bd034209e61 -r143f7b732efbb9efdc690757823e711b5022b29d
--- firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 3a4d8c5c7ca884827801433839080bd034209e61)
+++ firmware/App/Drivers/BPDriver.c	(.../BPDriver.c)	(revision 143f7b732efbb9efdc690757823e711b5022b29d)
@@ -44,7 +44,7 @@
 
 // ********** private data **********
 
-static BP_DRIVER_STATE_T bpDriverState = BP_DRIVER_IDLE_STATE;                      ///< Current blood pressure driver state.
+static BP_DRIVER_STATE_T bpDriverState;                                             ///< Current blood pressure driver state.
 static BP_VITALS_DATA_T bpResults;                                                  ///< Latest blood pressure measurement results.
 static BOOL bpMeasurementReady;                                                     ///< Blood pressure measurement ready
 static BOOL bpDriverError;                                                          ///< Blood pressure driver error