diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
index 82bc322824..5fcf9ee85b 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt
@@ -27,7 +27,7 @@ class DummyService : DaggerService() {
 
     private val disposable = CompositeDisposable()
 
-    override fun onBind(intent: Intent): IBinder? = null
+    override fun onBind(intent: Intent?): IBinder? = null
 
     override fun onCreate() {
         super.onCreate()
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
index 916239ae82..55a186fc9f 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/TimeDateOrTZChangeReceiver.kt
@@ -39,32 +39,37 @@ class TimeDateOrTZChangeReceiver : DaggerBroadcastReceiver() {
         val activePump: PumpInterface = activePlugin.activePump
 
         aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Date, Time and/or TimeZone changed. [action={}]", action)
-        aapsLogger.debug(LTag.PUMP,"TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent))
+        try {
+            aapsLogger.debug(LTag.PUMP, "TimeDateOrTZChangeReceiver::Intent::{}", gson.toJson(intent))
+        } catch (ignored : Exception) {}
 
-        if (action == null) {
-            aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.")
-        } else if (Intent.ACTION_TIMEZONE_CHANGED == action) {
-            aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
-            activePump.timezoneOrDSTChanged(TimeChangeType.TimezoneChange)
-        } else if (Intent.ACTION_TIME_CHANGED == action) {
-            val currentDst = calculateDST()
-            if (currentDst == isDST) {
-                aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
-                activePump.timezoneOrDSTChanged(TimeChangeType.ManualTimeChange)
-            } else {
-                if (currentDst) {
-                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
-                    activePump.timezoneOrDSTChanged(TimeChangeType.DST_Started)
-                } else {
-                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
-                    activePump.timezoneOrDSTChanged(TimeChangeType.DST_Ended)
-                }
+        when {
+            action == null                           -> {
+                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Action is null. Exiting.")
+            }
+            Intent.ACTION_TIMEZONE_CHANGED == action -> {
+                aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Timezone changed. Notifying pump driver.")
+                activePump.timezoneOrDSTChanged(TimeChangeType.TimezoneChange)
+            }
+            Intent.ACTION_TIME_CHANGED == action     -> {
+                val currentDst = calculateDST()
+                if (currentDst == isDST) {
+                    aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::Time changed (manual). Notifying pump driver.")
+                    activePump.timezoneOrDSTChanged(TimeChangeType.ManualTimeChange)
+                } else {
+                    if (currentDst) {
+                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST started. Notifying pump driver.")
+                        activePump.timezoneOrDSTChanged(TimeChangeType.DST_Started)
+                    } else {
+                        aapsLogger.info(LTag.PUMP,"TimeDateOrTZChangeReceiver::DST ended. Notifying pump driver.")
+                        activePump.timezoneOrDSTChanged(TimeChangeType.DST_Ended)
+                    }
+                }
+                isDST = currentDst
+            }
+            else                                     -> {
+                aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
             }
-            isDST = currentDst
-        } else {
-            aapsLogger.error(LTag.PUMP,"TimeDateOrTZChangeReceiver::Unknown action received [name={}]. Exiting.", action)
         }
     }
-
-
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
index 4af050da21..2357dcebeb 100644
--- a/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
+++ b/app/src/main/java/info/nightscout/androidaps/services/LocationService.kt
@@ -72,7 +72,7 @@ class LocationService : DaggerService() {
         }
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         try {
             startForeground(notificationHolder.notificationID, notificationHolder.notification)
diff --git a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
index 140cfda5b4..f84e6af6e2 100644
--- a/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
+++ b/core/src/main/java/info/nightscout/androidaps/services/AlarmSoundService.kt
@@ -29,13 +29,13 @@ class AlarmSoundService : DaggerService() {
         startForeground(notificationHolder.notificationID, notificationHolder.notification)
     }
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         startForeground(notificationHolder.notificationID, notificationHolder.notification)
 
         player?.let { if (it.isPlaying) it.stop() }
 
         aapsLogger.debug(LTag.CORE, "onStartCommand")
-        if (intent.hasExtra("soundid")) resourceId = intent.getIntExtra("soundid", R.raw.error)
+        if (intent?.hasExtra("soundid") == true) resourceId = intent.getIntExtra("soundid", R.raw.error)
         player = MediaPlayer()
         try {
             val afd = resourceHelper.openRawResourceFd(resourceId) ?: return START_STICKY
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
index 56faab3e57..78c2655dec 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/activities/DanaHistoryActivity.kt
@@ -126,7 +126,7 @@ class DanaHistoryActivity : NoSplashAppCompatActivity() {
             })
         }
         danar_history_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
                 val selected = typeList[position]
                 loadDataFromDB(selected.type)
                 showingType = selected.type