diff --git a/build.gradle b/build.gradle
index 6dbaeff066..91acb09ffd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         rxkotlin_version = '3.0.1'
         room_version = '2.5.0'
         lifecycle_version = '2.5.1'
-        dagger_version = '2.44.2'
+        dagger_version = '2.45'
         coroutines_version = '1.6.4'
         activity_version = '1.6.1'
         fragmentktx_version = '1.5.5'
diff --git a/core/utils/build.gradle b/core/utils/build.gradle
index 9059ced179..3f0423d48f 100644
--- a/core/utils/build.gradle
+++ b/core/utils/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     implementation project(':app-wear-shared:shared')
 
     //Firebase
-    api platform('com.google.firebase:firebase-bom:31.2.0')
+    api platform('com.google.firebase:firebase-bom:31.2.1')
     api "com.google.firebase:firebase-analytics-ktx"
     api "com.google.firebase:firebase-crashlytics-ktx"
     // StatsActivity not in use now
diff --git a/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt b/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt
index beb1e5074e..13e5d845ef 100644
--- a/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt
+++ b/pump/combov2/comboctl/src/commonMain/kotlin/info/nightscout/comboctl/main/Pump.kt
@@ -1533,11 +1533,26 @@ class Pump(
         pumpMode = null,
         isIdempotent = false,
         description = DeliveringBolusCommandDesc(
-            totalBolusAmount,
-            immediateBolusAmount,
-            durationInMinutes,
-            standardBolusReason,
-            bolusType
+            totalBolusAmount = totalBolusAmount,
+            // A standard bolus only has an immediate portion, no extended one. This
+            // implies that its total amount is also its immediate amount. As the
+            // function documentation states, the user only species the total amount
+            // when delivering a standard bolus - the immediateBolusAmount argument
+            // of deliverBolus() is ignored. It makes no sense for users to have
+            // to specify the same value twice.
+            //
+            // For UI elements it is however useful to have immediateBolusAmount be
+            // automatically set to the totalBolusAmount when delivering a standard
+            // bolus. One example for why this is useful is when during the immediate
+            // portion of a bolus, a modal dialog is shown with a progress bar, while
+            // the extended portion shows no such dialog.
+            //
+            // For this reason, assign the totalBolusAmount quantity to the
+            // immediateBolusAmount field of the command desc if this is a standard bolus.
+            immediateBolusAmount = if (bolusType == CMDDeliverBolusType.STANDARD_BOLUS) totalBolusAmount else immediateBolusAmount,
+            durationInMinutes = durationInMinutes,
+            standardBolusReason = standardBolusReason,
+            bolusType = bolusType
         )
     ) {
         require((totalBolusAmount > 0) && (totalBolusAmount <= 250)) {