diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
index a3b82469b..78b1c1d87 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java
@@ -274,12 +274,8 @@ public abstract class AbstractDeviceSupport implements DeviceSupport {
             context.startActivity(intent);
             LOG.debug("CompanionDeviceManager associations were found, starting intent");
         } else {
-            LOG.warn("CompanionDeviceManager associations were not found, going to try to start intent anyway");
             GB.notify(GB.NOTIFICATION_ID_PHONE_FIND, notification.build(), context);
-            // Originally the Phone Find activity wasn't being started if no companion associations.
-            // Casio GDB-200 doesn't register companion but this still seems to work, so keeping
-            // warning but starting activity anyway
-            context.startActivity(intent);
+            LOG.warn("CompanionDeviceManager associations were not found, can't start intent");
         }
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e70af4809..fd6e9fbda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -336,7 +336,7 @@
     <string name="pref_summary_preview_message_in_title">Shows a preview of the message in the title of a notification as allowed by the device</string>
     <string name="pref_title_casio_alert_calendar">Alert for calendar notifications</string>
     <string name="pref_summary_casio_alert_calendar">Alert (vibrate/beep) for calendar notifications</string>
-    <string name="pref_title_casio_alert_call">Alert for calendar calls</string>
+    <string name="pref_title_casio_alert_call">Alert for incoming calls</string>
     <string name="pref_summary_casio_alert_call">Alert (vibrate/beep) for incoming calls</string>
     <string name="pref_title_casio_alert_email">Alert for email notifications</string>
     <string name="pref_summary_casio_alert_email">Alert (vibrate/beep) for email notifications</string>
diff --git a/app/src/main/res/xml/devicesettings_casio_alert.xml b/app/src/main/res/xml/devicesettings_casio_alert.xml
index 506b04421..c5327fe6a 100644
--- a/app/src/main/res/xml/devicesettings_casio_alert.xml
+++ b/app/src/main/res/xml/devicesettings_casio_alert.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_my_calendar"
-        android:key="casio_alert_calendar"
-        android:summary="@string/pref_summary_casio_alert_calendar"
-        android:title="@string/pref_title_casio_alert_calendar" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_call"
-        android:key="casio_alert_call"
-        android:summary="@string/pref_summary_casio_alert_call"
-        android:title="@string/pref_title_casio_alert_call" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_email"
         android:key="casio_alert_email"
         android:summary="@string/pref_summary_casio_alert_email"
         android:title="@string/pref_title_casio_alert_email" />
-    <SwitchPreference
-        android:defaultValue="true"
-        android:icon="@android:drawable/ic_menu_help"
-        android:key="casio_alert_other"
-        android:summary="@string/pref_summary_casio_alert_other"
-        android:title="@string/pref_title_casio_alert_other" />
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@drawable/ic_message_outline"
         android:key="casio_alert_sms"
         android:summary="@string/pref_summary_casio_alert_sms"
         android:title="@string/pref_title_casio_alert_sms" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_call"
+        android:key="casio_alert_call"
+        android:summary="@string/pref_summary_casio_alert_call"
+        android:title="@string/pref_title_casio_alert_call" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_my_calendar"
+        android:key="casio_alert_calendar"
+        android:summary="@string/pref_summary_casio_alert_calendar"
+        android:title="@string/pref_title_casio_alert_calendar" />
+    <SwitchPreferenceCompat
+        android:defaultValue="true"
+        android:icon="@android:drawable/ic_menu_help"
+        android:key="casio_alert_other"
+        android:summary="@string/pref_summary_casio_alert_other"
+        android:title="@string/pref_title_casio_alert_other" />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/devicesettings_preview_message_in_title.xml b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
index 4c72099df..cfd18189b 100644
--- a/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
+++ b/app/src/main/res/xml/devicesettings_preview_message_in_title.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreference
+    <SwitchPreferenceCompat
         android:defaultValue="true"
         android:icon="@android:drawable/ic_menu_view"
         android:key="preview_message_in_title"
diff --git a/app/src/main/res/xml/discovery_pairing_preferences.xml b/app/src/main/res/xml/discovery_pairing_preferences.xml
index c21b4f7a5..4871f7fe1 100644
--- a/app/src/main/res/xml/discovery_pairing_preferences.xml
+++ b/app/src/main/res/xml/discovery_pairing_preferences.xml
@@ -10,7 +10,7 @@
         android:title="@string/ignore_bonded_devices"
         app:iconSpaceReserved="false" />
     <SwitchPreferenceCompat
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="enable_companiondevice_pairing"
         android:layout="@layout/preference_checkbox"
         android:summary="@string/companiondevice_pairing_details"