diff --git a/.idea/dictionaries/project_dictionary.xml b/.idea/dictionaries/project_dictionary.xml
index bb6d3b3c49..cf9b196645 100644
--- a/.idea/dictionaries/project_dictionary.xml
+++ b/.idea/dictionaries/project_dictionary.xml
@@ -2,6 +2,7 @@
   <dictionary name="project-dictionary">
     <words>
       <w>aaps</w>
+      <w>aapsclient</w>
       <w>abcdef</w>
       <w>accu</w>
       <w>acked</w>
@@ -18,11 +19,13 @@
       <w>bage</w>
       <w>basaliob</w>
       <w>basals</w>
+      <w>batt</w>
       <w>bgcheck</w>
       <w>bgsource</w>
       <w>boluscalc</w>
       <w>bolusing</w>
       <w>boluswizard</w>
+      <w>boyda</w>
       <w>carb</w>
       <w>carbratio</w>
       <w>carbs</w>
@@ -67,6 +70,7 @@
       <w>humalog</w>
       <w>iage</w>
       <w>infinivocgm</w>
+      <w>instantiator</w>
       <w>insulet</w>
       <w>intelligo</w>
       <w>iobtotal</w>
@@ -78,6 +82,7 @@
       <w>lyumjev</w>
       <w>mdtp</w>
       <w>medtronic</w>
+      <w>medtrum</w>
       <w>mgdl</w>
       <w>miao</w>
       <w>misformatted</w>
@@ -99,6 +104,7 @@
       <w>oref</w>
       <w>otpauth</w>
       <w>passcode</w>
+      <w>pbage</w>
       <w>pdus</w>
       <w>philoul</w>
       <w>poctech</w>
@@ -108,6 +114,7 @@
       <w>pumpcontrol</w>
       <w>pumpdrivers</w>
       <w>quickwizard</w>
+      <w>rawbg</w>
       <w>readstatus</w>
       <w>realduration</w>
       <w>refresheventsfromnightscout</w>
diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
index d476796218..1657944589 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
@@ -83,7 +83,7 @@ class DetailedBolusInfoStorageImpl @Inject constructor(
 
     private fun loadStore(): ArrayList<DetailedBolusInfo> {
         val jsonString = sp.getString(rh.gs(R.string.key_bolus_storage), "")
-        return if (jsonString != null && jsonString.isNotEmpty()) {
+        return if (jsonString.isNotEmpty()) {
             val type = object : TypeToken<List<DetailedBolusInfo>>() {}.type
             Gson().fromJson(jsonString, type)
         } else {
diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt
index 2a3907cbac..26d08dab02 100644
--- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt
+++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt
@@ -37,7 +37,7 @@ class MedtrumOverviewFragment : MedtrumBaseFragment<FragmentMedtrumOverviewBindi
         super.onViewCreated(view, savedInstanceState)
 
         binding.apply {
-            viewmodel = ViewModelProvider(this@MedtrumOverviewFragment, viewModelFactory).get(MedtrumOverviewViewModel::class.java)
+            viewmodel = ViewModelProvider(this@MedtrumOverviewFragment, viewModelFactory)[MedtrumOverviewViewModel::class.java]
             viewmodel?.apply {
                 eventHandler.observe(viewLifecycleOwner) { evt ->
                     when (evt.peekContent()) {
@@ -65,19 +65,9 @@ class MedtrumOverviewFragment : MedtrumBaseFragment<FragmentMedtrumOverviewBindi
                         }
 
                         EventType.PROFILE_NOT_SET      -> ToastUtils.infoToast(requireContext(), R.string.no_profile_selected)
-
-                        else                           -> Unit
                     }
                 }
             }
         }
     }
-
-    override fun onPause() {
-        super.onPause()
-    }
-
-    override fun onResume() {
-        super.onResume()
-    }
 }