Index: firmware/App/Services/CommBuffers.c
===================================================================
diff -u -r6ec678e1c03a52564f5699986fe5d608f95cce79 -rd45c21793bdd738fb325eb7ff4446f50c2c8526d
--- firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision 6ec678e1c03a52564f5699986fe5d608f95cce79)
+++ firmware/App/Services/CommBuffers.c	(.../CommBuffers.c)	(revision d45c21793bdd738fb325eb7ff4446f50c2c8526d)
@@ -210,7 +210,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 );
 
@@ -219,7 +219,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;
@@ -267,7 +267,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 )
@@ -338,7 +338,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;
@@ -364,7 +364,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/Services/SystemCommMessages.c
===================================================================
diff -u -rc9444670e4c9a0d18375ea2687538c421200fac3 -rd45c21793bdd738fb325eb7ff4446f50c2c8526d
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c9444670e4c9a0d18375ea2687538c421200fac3)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d45c21793bdd738fb325eb7ff4446f50c2c8526d)
@@ -1662,17 +1662,18 @@
 {
     BOOL result = FALSE;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) )
+    if ( message->hdr.payloadLen == sizeof( BOOL ) )
     {
         BOOL startingTreatment;
+        DG_OP_MODE_T dgMode = getCurrentOperationMode();
 
-        memcpy( &startingTreatment, message->payload, sizeof( U32 ) );
+        memcpy( &startingTreatment, message->payload, sizeof( BOOL ) );
 
-        if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( TRUE == startingTreatment ) )
+        if ( ( DG_MODE_STAN == dgMode ) && ( TRUE == startingTreatment ) )
         {
             result = requestDGStart();
         }
-        else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
+        else if ( ( dgMode >= DG_MODE_GENE ) && ( dgMode <= DG_MODE_DRAI ) && ( FALSE == startingTreatment ) )
         {
             result = requestDGStop();
         }