Index: firmware/App/Controllers/DGInterface.c
===================================================================
diff -u -r9e2667ac9d2f1b2add9811f93477f0365f1b4eb7 -r6a43b24baa34ac9d842e2bdf8396aad333571d6b
--- firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 9e2667ac9d2f1b2add9811f93477f0365f1b4eb7)
+++ firmware/App/Controllers/DGInterface.c	(.../DGInterface.c)	(revision 6a43b24baa34ac9d842e2bdf8396aad333571d6b)
@@ -947,7 +947,7 @@
  *************************************************************************/
 void checkDGRestart( void )
 {
-    if ( dgStartCommandSent == TRUE && ( DG_MODE_CIRC == dgCurrentOpMode ) )
+    if ( ( dgStartCommandSent == TRUE ) && ( DG_MODE_CIRC == dgCurrentOpMode ) )
     {
         dgStartCommandSent = FALSE;
         dgStarted = TRUE;
Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r6cd85442baebdeecec6fc9b5009011b8d961f45c -r6a43b24baa34ac9d842e2bdf8396aad333571d6b
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6cd85442baebdeecec6fc9b5009011b8d961f45c)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6a43b24baa34ac9d842e2bdf8396aad333571d6b)
@@ -29,7 +29,7 @@
 // ********** private data **********
 
 static CONSUMABLE_SELF_TESTS_STATE_T currentConsumableSelfTestState;        ///< Current state of the consumable self-tests state machine.
-static BOOL confirmConsumableInstallRequested;                              ///< Flag indicates user has confirmed the installation of consumables.
+static BOOL consumableInstallConfirmed;                                     ///< Flag indicates user has confirmed the installation of consumables.
 
 // ********** private function prototypes **********
 
@@ -45,7 +45,7 @@
 void initConsumableSelfTest( void )
 {
     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_INSTALL_STATE;
-    confirmConsumableInstallRequested = FALSE;
+    consumableInstallConfirmed = FALSE;
 }
 
 /*********************************************************************//**
@@ -81,7 +81,7 @@
                 cmdStartDG();
                 cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
                 cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-                confirmConsumableInstallRequested = FALSE;
+                consumableInstallConfirmed = FALSE;
 #ifdef SKIP_CONSUMABLE_TESTS
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
 #else
@@ -154,7 +154,7 @@
  *************************************************************************/
 void signalUserConfirmConsumableInstall( void )
 {
-    confirmConsumableInstallRequested = TRUE;
+    consumableInstallConfirmed = TRUE;
 }
 
 /*********************************************************************//**
Index: firmware/App/Modes/Prime.h
===================================================================
diff -u -r5e0257ef85adb18a5c8837d9804304f405080266 -r6a43b24baa34ac9d842e2bdf8396aad333571d6b
--- firmware/App/Modes/Prime.h	(.../Prime.h)	(revision 5e0257ef85adb18a5c8837d9804304f405080266)
+++ firmware/App/Modes/Prime.h	(.../Prime.h)	(revision 6a43b24baa34ac9d842e2bdf8396aad333571d6b)
@@ -43,8 +43,6 @@
 
 #pragma pack(pop)
 
-#define PRIME_CONSUMED_DIALYSATE_VOLUME_ML      100             ///< Volume of dialysate consumed during prime.
-
 // ********** public function prototypes **********
 
 void initPrime( void );