Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -rf2cecb1dae0cfccc768b321f1d0cdec9a73c5824 -r031627883dbd40abd52312d64a1a3b811478d1c3
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision f2cecb1dae0cfccc768b321f1d0cdec9a73c5824)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 031627883dbd40abd52312d64a1a3b811478d1c3)
@@ -791,7 +791,7 @@
 {
     dgStartCommandSent = TRUE;
 
-    sendDGStartStopCommand( START_DG_CMD );
+    sendDGStartStopCommand( (BOOL)START_DG_CMD );
 }
 
 /*********************************************************************//**
@@ -806,7 +806,7 @@
 {
     dgStarted = FALSE;
 
-    sendDGStartStopCommand( STOP_DG_CMD );
+    sendDGStartStopCommand( (BOOL)STOP_DG_CMD );
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -re4cc37257141c5227186ac6d8ca3d6c87d009042 -r031627883dbd40abd52312d64a1a3b811478d1c3
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e4cc37257141c5227186ac6d8ca3d6c87d009042)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 031627883dbd40abd52312d64a1a3b811478d1c3)
@@ -441,7 +441,7 @@
         {
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
         }
-
+        // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
         if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )
         {
             cmdStopDG();
Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r421ffbd3887d136b66da26ee3eeb17dcd9a773b8 -r031627883dbd40abd52312d64a1a3b811478d1c3
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 421ffbd3887d136b66da26ee3eeb17dcd9a773b8)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 031627883dbd40abd52312d64a1a3b811478d1c3)
@@ -214,7 +214,7 @@
         if ( ( len <= ( COMM_BUFFER_LENGTH * DOUBLE_BUFFERS ) ) && ( len <= numberOfBytesInCommBuffer( buffer ) ) )
         {
             U32 activeBuffer = activeDoubleBuffer[ buffer ];
-            U32 inactiveBuffer = ( activeBuffer == 0 ? 1 : 0 );
+            U32 inactiveBuffer = GET_TOGGLE( activeBuffer, 0, 1 );
             U32 bytesInInactiveBuffer = commBufferByteCount[ buffer ][ inactiveBuffer ];
             U32 sizeOfFirstConsumption = MIN( len, bytesInInactiveBuffer );
 
@@ -223,7 +223,7 @@
             // Will return # of bytes consumed
             result = sizeOfFirstConsumption;
             // Do we need more from active buffer?
-            if ( len > bytesInInactiveBuffer )
+            if ( len > sizeOfFirstConsumption )
             {
                 U32 remNumOfBytes = len - sizeOfFirstConsumption;
                 U08 *remPtr = data + sizeOfFirstConsumption;
@@ -272,7 +272,7 @@
         if ( ( len <= ( COMM_BUFFER_LENGTH * DOUBLE_BUFFERS ) ) && ( len <= numberOfBytesInCommBuffer( buffer ) ) )
         {
             U32 activeBuffer = activeDoubleBuffer[ buffer ];
-            U32 inactiveBuffer = ( activeBuffer == 0 ? 1 : 0 );
+            U32 inactiveBuffer = GET_TOGGLE( activeBuffer, 0, 1 );
             U32 bytesInInactiveBuffer = commBufferByteCount[ buffer ][ inactiveBuffer ];
 
             if ( len <= bytesInInactiveBuffer )
@@ -345,7 +345,7 @@
 static U32 switchDoubleBuffer( COMM_BUFFER_T buffer )
 {
     U32 activeBuffer = activeDoubleBuffer[ buffer ];
-    U32 inactiveBuffer = ( activeBuffer == 0 ? 1 : 0 );
+    U32 inactiveBuffer = GET_TOGGLE( activeBuffer, 0, 1 );
 
     // Ensure inactive buffer is reset before making active
     commBufferByteCount[ buffer ][ inactiveBuffer ] = 0;
@@ -371,7 +371,7 @@
 static void getDataFromInactiveBuffer( COMM_BUFFER_T buffer, U08 *data, U32 len )
 {
     U32 activeBuffer = activeDoubleBuffer[ buffer ];
-    U32 inactiveBuffer = ( activeBuffer == 0 ? 1 : 0 );
+    U32 inactiveBuffer = GET_TOGGLE( activeBuffer, 0, 1 );
     U32 bytesInInactiveBuffer = commBufferByteCount[ buffer ][ inactiveBuffer ];
 
     // Get the requested data from inactive buffer
Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r8f217e3f4f171dba78c9ac69a3470af442941a89 -r031627883dbd40abd52312d64a1a3b811478d1c3
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 8f217e3f4f171dba78c9ac69a3470af442941a89)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 031627883dbd40abd52312d64a1a3b811478d1c3)
@@ -33,7 +33,7 @@
 
 // ********** private definitions **********
 
-#define MAX_TIME_FOR_UI_TO_COMMUNICATE_MS       30000               ///< Maximum time we wait for UI to communicate after power up (30 seconds).
+#define MAX_TIME_FOR_UI_TO_COMMUNICATE_MS       40000               ///< Maximum time we wait for UI to communicate after power up (40 seconds).
 
 // ********** private data **********