diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index be3de54f2..6c99a68cc 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -246,14 +246,14 @@ public class AppDetails extends ListActivity {
     private void install() {
         new Thread() {
             public void run() {
-                String apk_pkg = downloadFile(app, curapk);
-                if (apk_pkg == null) {
+                String apk_file = downloadFile(app, curapk);
+                if (apk_file == null) {
                     Message msg = new Message();
                     msg.arg1 = 1;
                     download_handler.sendMessage(msg);
                     download_error_handler.sendEmptyMessage(0);
                 } else {
-                    installApk(apk_pkg);
+                    installApk(apk_file);
                 }
             }
         }.start();
diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index 69123ba4e..300af0242 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -59,18 +59,19 @@ public class RepoXMLHandler extends DefaultHandler {
 
         String str = new String(ch).substring(start, start + length);
         if (curapk != null && curel != null) {
-            if (curel == "version")
+            if (curel == "version") {
                 curapk.version = str;
-            if (curel == "versioncode") {
+            } else if (curel == "versioncode") {
                 try {
                     curapk.vercode = Integer.parseInt(str);
                 } catch (NumberFormatException ex) {
                     curapk.vercode = 0;
                 }
-            } else if (curel == "hash")
+            } else if (curel == "hash") {
                 curapk.hash = str;
-            else if (curel == "apkname")
+            } else if (curel == "apkname") {
                 curapk.apkName = str;
+            }
         } else if (curapp != null && curel != null) {
             if (curel == "id")
                 curapp.id = str;