diff --git a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
index 858746e07..c60913939 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/RepoPersister.java
@@ -122,7 +122,7 @@ public class RepoPersister {
         try {
             context.getContentResolver().applyBatch(TempApkProvider.getAuthority(), apkOperations);
         } catch (RemoteException | OperationApplicationException e) {
-            throw new RepoUpdater.UpdateException(repo, "An internal error occured while updating the database", e);
+            throw new RepoUpdater.UpdateException(repo, "An internal error occurred while updating the database", e);
         }
     }
 
@@ -132,7 +132,7 @@ public class RepoPersister {
         try {
             context.getContentResolver().applyBatch(TempAppProvider.getAuthority(), appOperations);
         } catch (RemoteException | OperationApplicationException e) {
-            throw new RepoUpdater.UpdateException(repo, "An internal error occured while updating the database", e);
+            throw new RepoUpdater.UpdateException(repo, "An internal error occurred while updating the database", e);
         }
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
index 66148704f..352c341b1 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
@@ -89,15 +89,15 @@ public class TempApkProvider extends ApkProvider {
 
     @Override
     public Uri insert(Uri uri, ContentValues values) {
-        int code = matcher.match(uri);
-        if (code == CODE_INIT) {
-            initTable();
-            return null;
-        } else if (code == CODE_COMMIT) {
-            commitTable();
-            return null;
-        } else {
-            return super.insert(uri, values);
+        switch (matcher.match(uri)) {
+            case CODE_INIT:
+                initTable();
+                return null;
+            case CODE_COMMIT:
+                commitTable();
+                return null;
+            default:
+                return super.insert(uri, values);
         }
     }
 
diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
index a307a08f5..7e5d67702 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
@@ -77,17 +77,16 @@ public class TempAppProvider extends AppProvider {
 
     @Override
     public Uri insert(Uri uri, ContentValues values) {
-        int code = matcher.match(uri);
-
-        if (code == CODE_INIT) {
-            initTable();
-            return null;
-        } else if (code == CODE_COMMIT) {
-            updateAppDetails();
-            commitTable();
-            return null;
-        } else {
-            return super.insert(uri, values);
+        switch (matcher.match(uri)) {
+            case CODE_INIT:
+                initTable();
+                return null;
+            case CODE_COMMIT:
+                updateAppDetails();
+                commitTable();
+                return null;
+            default:
+                return super.insert(uri, values);
         }
     }