diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index 92cabd569..d4f50c534 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -192,7 +192,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.15'
+    toolVersion = '6.16'
 }
 
 task checkstyle(type: Checkstyle) {
diff --git a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
index dce66b2a3..1f0fe24f3 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/DBHelper.java
@@ -110,7 +110,7 @@ class DBHelper extends SQLiteOpenHelper {
 
     private final Context context;
 
-    public DBHelper(Context context) {
+    DBHelper(Context context) {
         super(context, DATABASE_NAME, null, DB_VERSION);
         this.context = context;
     }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
index 6406fe961..137921cf7 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * TODO: The content providers are not thread safe, so it is possible we will be writing
  * to the database at the same time we respond to a broadcasted intent.
  */
-public class InstalledAppCacheUpdater {
+public final class InstalledAppCacheUpdater {
 
     private static final String TAG = "InstalledAppCache";
 
diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 2e1f6edac..b5f8ed5c0 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -774,8 +774,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                     public void run() {
                         new SwapDebug().logStatus();
                     }
-                },
-                1000
+                }, 1000
             );
         }
     }
diff --git a/Privileged-Extension/build.gradle b/Privileged-Extension/build.gradle
index a0a55d871..f87e5543e 100644
--- a/Privileged-Extension/build.gradle
+++ b/Privileged-Extension/build.gradle
@@ -36,7 +36,7 @@ android {
 }
 
 checkstyle {
-    toolVersion = '6.15'
+    toolVersion = '6.16'
 }
 
 task checkstyle(type: Checkstyle) {