Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rd8c4c523f0551a95c3c6ee5cf5b693f75161d163 -rb3b1fa54f778d9f202c28bb1970db2616367f0b1
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision d8c4c523f0551a95c3c6ee5cf5b693f75161d163)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision b3b1fa54f778d9f202c28bb1970db2616367f0b1)
@@ -115,7 +115,11 @@
     LOAD_CELL_ID_T drainWeightLoadCell = LOAD_CELL_A1;
 
     // determine which load cell to use for drain volume - we want weight of inactive reservoir
+#ifndef BETA_V1_BUILD
+    if ( RESERVOIR_2 == getActiveReservoir() )
+#else
     if ( RESERVOIR_1 == getActiveReservoir() )
+#endif
     {
         drainWeightLoadCell = LOAD_CELL_B1;
     }
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -re66245baae86e539e8470aa9739a99a2146d5f17 -rb3b1fa54f778d9f202c28bb1970db2616367f0b1
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e66245baae86e539e8470aa9739a99a2146d5f17)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision b3b1fa54f778d9f202c28bb1970db2616367f0b1)
@@ -199,6 +199,7 @@
     {
         fillVolumeTargetMl.data = 0;
         requestNewOperationMode( DG_MODE_CIRC );
+        result = TRUE;
     }
 
     return result;
@@ -225,6 +226,7 @@
         {
             drainVolumeTargetMl.data = drainToVolMl;
             requestNewOperationMode( DG_MODE_DRAI );
+            result = TRUE;
         }
     }
 
@@ -248,6 +250,7 @@
     {
         drainVolumeTargetMl.data = 0;
         requestNewOperationMode( DG_MODE_CIRC );
+        result = TRUE;
     }
 
     return result;
@@ -265,7 +268,9 @@
 BOOL startTrimmerHeaterCmd( void )
 {
     BOOL result = FALSE;
+
     result = startTrimmerHeater();
+
     return result;
 }
 
@@ -281,7 +286,9 @@
 BOOL stopTrimmerHeaterCmd( void )
 {
     BOOL result = TRUE;
+
     stopTrimmerHeater();
+
     return result;
 }