diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index 8f5d09e84..94fb31063 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -1299,7 +1299,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
             updateViews(view);
         }
 
-        private View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
             public void onClick(View v) {
                 switch(v.getId()) {
                     case R.id.website:
@@ -1341,7 +1341,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
             }
         };
 
-        private View.OnClickListener expander_description = new View.OnClickListener() {
+        private final View.OnClickListener expander_description = new View.OnClickListener() {
             public void onClick(View v) {
                 final TextView description = (TextView) ll_view_more_description.findViewById(R.id.description);
                 final ImageView view_more_permissions = (ImageView) ll_view_more_description.findViewById(R.id.view_more_description);
@@ -1357,7 +1357,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
             }
         };
 
-        private View.OnClickListener expander_information = new View.OnClickListener() {
+        private final View.OnClickListener expander_information = new View.OnClickListener() {
             public void onClick(View v) {
                 final TextView informationHeader = (TextView) ll_view_more_information.findViewById(R.id.information);
                 final LinearLayout information_content = (LinearLayout) ll_view_more_information.findViewById(R.id.ll_information_content);
@@ -1373,7 +1373,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
             }
         };
 
-        private View.OnClickListener expander_permissions = new View.OnClickListener() {
+        private final View.OnClickListener expander_permissions = new View.OnClickListener() {
             public void onClick(View v) {
                 final TextView permissionHeader = (TextView) ll_view_more_permissions.findViewById(R.id.permissions);
                 final TextView permissionListView = (TextView) ll_view_more_permissions.findViewById(R.id.permissions_list);
@@ -1551,7 +1551,7 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
 
         }
 
-        private View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
             public void onClick(View v) {
                 if (updateWanted) {
                     if (getApp().suggestedVercode > 0) {
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
index 6ea8a224e..bcdc9fd69 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidApp.java
@@ -76,8 +76,6 @@ public class FDroidApp extends Application {
     private static Messenger localRepoServiceMessenger = null;
     private static boolean localRepoServiceIsBound = false;
 
-    private static final String TAG = "FDroidApp";
-
     BluetoothAdapter bluetoothAdapter = null;
 
     static {
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/AppDiff.java b/F-Droid/src/org/fdroid/fdroid/installer/AppDiff.java
index e9d9ede17..9e68b866a 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/AppDiff.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/AppDiff.java
@@ -25,8 +25,8 @@ import android.net.Uri;
 
 public class AppDiff {
 
-    PackageManager mPm;
-    PackageInfo mPkgInfo;
+    final PackageManager mPm;
+    final PackageInfo mPkgInfo;
 
     ApplicationInfo mInstalledAppInfo = null;
 
diff --git a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
index 9eb1ee740..b59f5ea78 100644
--- a/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
+++ b/F-Droid/src/org/fdroid/fdroid/installer/InstallIntoSystemDialogActivity.java
@@ -179,7 +179,7 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
     /**
      * 1. Check for root access
      */
-    public AsyncTask<Void, Void, Boolean> checkRootTask = new AsyncTask<Void, Void, Boolean>() {
+    public final AsyncTask<Void, Void, Boolean> checkRootTask = new AsyncTask<Void, Void, Boolean>() {
         ProgressDialog mProgressDialog;
 
         @Override
@@ -245,7 +245,7 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
     /**
      * 2. Install into system
      */
-    AsyncTask<Void, Void, Void> installTask = new AsyncTask<Void, Void, Void>() {
+    final AsyncTask<Void, Void, Void> installTask = new AsyncTask<Void, Void, Void>() {
         ProgressDialog mProgressDialog;
 
         @Override
@@ -336,7 +336,7 @@ public class InstallIntoSystemDialogActivity extends FragmentActivity {
         }
     }
 
-    AsyncTask<Void, Void, Void> uninstallTask = new AsyncTask<Void, Void, Void>() {
+    final AsyncTask<Void, Void, Void> uninstallTask = new AsyncTask<Void, Void, Void>() {
         ProgressDialog mProgressDialog;
 
         @Override