diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 277a3f8f3..fee83b2ba 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -634,7 +634,8 @@ public class AppDetails extends ListActivity {
                 downloadHandler.cancel();
             }
         });
-        pd.setButton(getString(R.string.cancel),
+        pd.setButton(DialogInterface.BUTTON_NEUTRAL,
+                getString(R.string.cancel),
                 new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         pd.cancel();
@@ -699,6 +700,8 @@ public class AppDetails extends ListActivity {
                         Toast.LENGTH_SHORT).show();
                 finished = true;
                 break;
+            default:
+                break;
             }
             return finished;
         }
diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index db18b860d..2dd410285 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -279,6 +279,7 @@ public class DB {
         public static abstract class CompatibilityChecker {
 
             // Because Build.VERSION.SDK_INT requires API level 5
+            @SuppressWarnings("deprecation")
             protected final static int SDK_INT = Integer
                     .parseInt(Build.VERSION.SDK);
 
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 66289c2f0..7ae2ae603 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -140,11 +140,6 @@ public class FDroid extends TabActivity implements OnItemClickListener,
         populateLists();
     }
 
-    @Override
-    protected void onStop() {
-        super.onStop();
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 
diff --git a/src/org/fdroid/fdroid/ManageRepo.java b/src/org/fdroid/fdroid/ManageRepo.java
index 42ea6c0e3..9416fb5ed 100644
--- a/src/org/fdroid/fdroid/ManageRepo.java
+++ b/src/org/fdroid/fdroid/ManageRepo.java
@@ -116,6 +116,7 @@ public class ManageRepo extends ListActivity {
                                 fingerprint[i]);
                     }
                     server_line.put("fingerprint", formatter.toString());
+                    formatter.close();
                 } catch (Exception e) {
                     Log.w("FDroid", "Unable to get certificate fingerprint.\n"
                             + Log.getStackTraceString(e));
@@ -169,7 +170,8 @@ public class ManageRepo extends ListActivity {
 
             alrt.setIcon(android.R.drawable.ic_menu_add);
             alrt.setTitle(getString(R.string.repo_add_title));
-            alrt.setButton(getString(R.string.repo_add_add),
+            alrt.setButton(DialogInterface.BUTTON_POSITIVE,
+                    getString(R.string.repo_add_add),
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             EditText uri = (EditText) alrt
@@ -186,7 +188,8 @@ public class ManageRepo extends ListActivity {
                         }
                     });
 
-            alrt.setButton2(getString(R.string.cancel),
+            alrt.setButton(DialogInterface.BUTTON_NEGATIVE,
+                    getString(R.string.cancel),
                     new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             return;