diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 120021760..aff0a6e78 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -219,12 +219,13 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     public App() {
     }
 
-    public App(Cursor cursor) {
+    public App(final Cursor cursor) {
 
         checkCursorPosition(cursor);
 
-        for (int i = 0; i < cursor.getColumnCount(); i++) {
-            String n = cursor.getColumnName(i);
+        final int cursorColumnCount = cursor.getColumnCount();
+        for (int i = 0; i < cursorColumnCount; i++) {
+            final String n = cursor.getColumnName(i);
             switch (n) {
                 case Cols.ROW_ID:
                     id = cursor.getLong(i);
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
index 4d1590cce..32fc0561d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListAdapter.java
@@ -34,7 +34,8 @@ class AppListAdapter extends RecyclerView.Adapter<StandardAppListItemController>
     @Override
     public void onBindViewHolder(StandardAppListItemController holder, int position) {
         cursor.moveToPosition(position);
-        holder.bindModel(new App(cursor));
+        final App app = new App(cursor);
+        holder.bindModel(app);
     }
 
     @Override
diff --git a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
index 7500f16d6..671ec8b27 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/whatsnew/WhatsNewAdapter.java
@@ -80,7 +80,8 @@ public class WhatsNewAdapter extends RecyclerView.Adapter<AppCardController> {
     @Override
     public void onBindViewHolder(AppCardController holder, int position) {
         cursor.moveToPosition(position);
-        holder.bindApp(new App(cursor));
+        final App app = new App(cursor);
+        holder.bindApp(app);
     }
 
     @Override