diff --git a/app/build.gradle b/app/build.gradle
index 2b79055..8e00452 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ android {
         applicationId "io.github.chronosx88.yggdrasil"
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 7
+        versionCode 8
         versionName "1.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
index 3fdad18..f48711e 100644
--- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt
@@ -79,7 +79,7 @@ class PeerListActivity : AppCompatActivity() {
         var peerListUrl: String =
             preferences.getString(PEER_LIST, "")!!
         if(!peerListUrl.isNullOrBlank()){
-            peerListUrl = this@PeerListActivity.peerListUrl
+            this@PeerListActivity.peerListUrl = peerListUrl
         }
         var extras = intent.extras
         var peerList = findViewById<ListView>(R.id.peerList)
@@ -119,7 +119,7 @@ class PeerListActivity : AppCompatActivity() {
                             }
                         }
                     }
-                    var json = downloadJson(peerListUrl)
+                    var json = downloadJson(this@PeerListActivity.peerListUrl)
                     var countries = CCPCountry.getLibraryMasterCountriesEnglish()
                     val mapType: Type = object :
                         TypeToken<Map<String?, Map<String, Status>>>() {}.type
@@ -349,7 +349,7 @@ class PeerListActivity : AppCompatActivity() {
         }
 
         val editUrl = menu.findItem(R.id.editUrlItem) as MenuItem
-        item.setActionView(R.layout.menu_edit_url)
+        editUrl.setActionView(R.layout.menu_edit_url)
         val editUrlButton = editUrl
             .actionView.findViewById<Button>(R.id.editUrlButton)
         editUrlButton.setOnClickListener {