diff --git a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
index 749883646..424a02f4d 100644
--- a/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
+++ b/F-Droid/src/org/fdroid/fdroid/CompatibilityChecker.java
@@ -94,10 +94,10 @@ public class CompatibilityChecker extends Compatibility {
 
         if (apk.features != null) {
             for (final String feat : apk.features) {
-                if (ignoreTouchscreen
-                        && feat.equals("android.hardware.touchscreen")) {
-                    // Don't check it!
-                } else if (!features.contains(feat)) {
+                if (ignoreTouchscreen && feat.equals("android.hardware.touchscreen")) {
+                    continue;
+                }
+                if (!features.contains(feat)) {
                     Collections.addAll(incompatibleReasons, feat.split(","));
                     if (BuildConfig.DEBUG) {
                         Log.d(TAG, apk.id + " vercode " + apk.vercode
diff --git a/F-Droid/src/org/fdroid/fdroid/Hasher.java b/F-Droid/src/org/fdroid/fdroid/Hasher.java
index b028cf91e..e5ec506e7 100644
--- a/F-Droid/src/org/fdroid/fdroid/Hasher.java
+++ b/F-Droid/src/org/fdroid/fdroid/Hasher.java
@@ -64,7 +64,7 @@ public class Hasher {
             return hashCache;
         else if (file != null) {
             byte[] buffer = new byte[1024];
-            int read = 0;
+            int read;
             InputStream input = null;
             try {
                 input = new BufferedInputStream(new FileInputStream(file));
diff --git a/F-Droid/src/org/fdroid/fdroid/UpdateService.java b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
index c94a44bac..742a5fb3c 100644
--- a/F-Droid/src/org/fdroid/fdroid/UpdateService.java
+++ b/F-Droid/src/org/fdroid/fdroid/UpdateService.java
@@ -564,8 +564,9 @@ public class UpdateService extends IntentService implements ProgressListener {
     private List<String> getKnownAppIds(List<App> apps) {
         List<String> knownAppIds = new ArrayList<>();
         if (apps.size() == 0) {
-            // Do nothing
-        } else if (apps.size() > AppProvider.MAX_APPS_TO_QUERY) {
+            return knownAppIds;
+        }
+        if (apps.size() > AppProvider.MAX_APPS_TO_QUERY) {
             int middle = apps.size() / 2;
             List<App> apps1 = apps.subList(0, middle);
             List<App> apps2 = apps.subList(middle, apps.size());
diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
index 8c3ecc3e0..990747d65 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
@@ -97,9 +97,7 @@ public class InstalledAppCacheUpdater {
             try {
                 context.getContentResolver().applyBatch(InstalledAppProvider.getAuthority(), ops);
                 Log.d(TAG, "Finished executing " + ops.size() + " CRUD operations on installed app cache.");
-            } catch (RemoteException e) {
-                Log.e(TAG, "Error updating installed app cache: " + e);
-            } catch (OperationApplicationException e) {
+            } catch (RemoteException | OperationApplicationException e) {
                 Log.e(TAG, "Error updating installed app cache: " + e);
             }
         }