diff --git a/app/build.gradle b/app/build.gradle
index aa707606b..b99c16ec1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -202,6 +202,8 @@ android {
 
         // to make CI fail on errors until this is fixed https://github.com/rtyley/spongycastle/issues/7
         warning 'InvalidPackage'
+
+        error 'AppCompatMethod', 'NestedScrolling', 'StringFormatCount', 'UnsafeProtectedBroadcastReceiver'
     }
 
     packagingOptions {
diff --git a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
index 19f8d9161..ec0619e1b 100644
--- a/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
+++ b/app/src/main/java/org/fdroid/fdroid/localrepo/SwapService.java
@@ -331,7 +331,7 @@ public class SwapService extends Service {
     // ==========================================
 
     private void persistAppsToSwap() {
-        persistence().edit().putString(KEY_APPS_TO_SWAP, serializePackages(appsToSwap)).commit();
+        persistence().edit().putString(KEY_APPS_TO_SWAP, serializePackages(appsToSwap)).apply();
     }
 
     /**
@@ -398,7 +398,7 @@ public class SwapService extends Service {
             persistence().edit()
                     .putBoolean(KEY_BLUETOOTH_ENABLED, bluetoothSwap.isConnected())
                     .putBoolean(KEY_WIFI_ENABLED, wifiSwap.isConnected())
-                    .commit();
+                    .apply();
         }
     };
 
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
index 126696d65..86b35b9f6 100644
--- a/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
+++ b/app/src/main/java/org/fdroid/fdroid/receiver/StartupReceiver.java
@@ -23,12 +23,18 @@ import android.content.Context;
 import android.content.Intent;
 
 import org.fdroid.fdroid.UpdateService;
+import org.fdroid.fdroid.Utils;
 
 public class StartupReceiver extends BroadcastReceiver {
+    private static final String TAG = "StartupReceiver";
 
     @Override
     public void onReceive(Context ctx, Intent intent) {
-        UpdateService.schedule(ctx);
+        if (Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            UpdateService.schedule(ctx);
+        } else {
+            Utils.debugLog(TAG, "received unsupported Intent " + intent);
+        }
     }
 
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
index 67dfe38d8..8521d1cad 100644
--- a/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/app/src/main/java/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
@@ -4,14 +4,21 @@ import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.net.wifi.WifiManager;
 
+import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.net.WifiStateChangeService;
 
 public class WifiStateChangeReceiver extends BroadcastReceiver {
+    private static final String TAG = "WifiStateChangeReceiver";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        intent.setComponent(new ComponentName(context, WifiStateChangeService.class));
-        context.startService(intent);
+        if (WifiManager.NETWORK_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+            intent.setComponent(new ComponentName(context, WifiStateChangeService.class));
+            context.startService(intent);
+        } else {
+            Utils.debugLog(TAG, "received unsupported Intent: " + intent);
+        }
     }
 }
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7f5b91d02..0675f7987 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -56,7 +56,7 @@
   <string name="repo_exists_add_fingerprint">Dette registret er allerede satt opp, dette vil legge til ny informasjon om nøkler.</string>
   <string name="repo_exists_enable">Dette registret er allerede satt opp, bekreft at du vil skru det på igjen.</string>
   <string name="repo_exists_and_enabled">Oppstrøms-pakkebrønnen er allerede satt opp og påskrudd.</string>
-  <string name="repo_delete_to_overwrite">Du må først slette denne pakkebrønnen før du kan legge til en med en en annen nøkkel.</string>
+  <string name="repo_delete_to_overwrite">Du må først slette denne pakkebrønnen før du kan legge til en med en annen nøkkel.</string>
   <string name="malformed_repo_uri">Ignorerer ugyldig pakkebrønnsadresse: %s</string>
   <string name="menu_update_repo">Oppdater pakkebrønnene</string>
   <string name="menu_manage">Pakkebrønner</string>
@@ -341,7 +341,7 @@
     <string name="keep_forever">For alltid</string>
 
     <string name="install_error_notify_title">Feil ved installasjon av %s</string>
-    <string name="uninstall_error_notify_title">Feil ved avinstallering</string>
+    <string name="uninstall_error_notify_title">Feil ved avinstallering av %s</string>
 
 
     <string name="installing">Installerer…</string>