diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt
index 68a3e9f69..83b9eda57 100644
--- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt
@@ -4,6 +4,7 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.util.Base64
 import com.geeksville.mesh.MeshProtos
+import com.geeksville.mesh.R
 import com.google.zxing.BarcodeFormat
 import com.google.zxing.MultiFormatWriter
 import com.journeyapps.barcodescanner.BarcodeEncoder
@@ -16,7 +17,7 @@ data class Channel(
     companion object {
         // Placeholder when emulating
         val emulated = Channel(
-            MeshProtos.ChannelSettings.newBuilder().setName("Default")
+            MeshProtos.ChannelSettings.newBuilder().setName(context.getString(R.string.default))
                 .setModemConfig(MeshProtos.ChannelSettings.ModemConfig.Bw125Cr45Sf128).build()
         )
 
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 71d3c7d0e..610a9e57c 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1098,8 +1098,6 @@ class MeshService : Service(), Logging {
      * Convert a protobuf NodeInfo into our model objects and update our node DB
      */
     private fun installNodeInfo(info: MeshProtos.NodeInfo) {
-        val mi = myNodeInfo!! // It better be set by now
-
         // Just replace/add any entry
         updateNodeInfo(info.num) {
             if (info.hasUser())
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
index 95a646c79..8054c9521 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt
@@ -78,8 +78,7 @@ class MapFragment : ScreenFragment("Map"), Logging {
                     )
                 )
                 node.user?.let {
-                    if (it.longName != null)
-                        f.addStringProperty("name", it.longName)
+                    f.addStringProperty("name", it.longName)
                 }
                 f
             }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index 5b1850692..51d29997b 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -535,7 +535,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
             .setSingleDevice(false)
             .build()
 
-        val mainActivity = requireActivity() as MainActivity
+        //val mainActivity = requireActivity() as MainActivity
 
         // When the app tries to pair with the Bluetooth device, show the
         // appropriate pairing request dialog to the user.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0976c025a..f752ebb56 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,4 +59,5 @@
     <string name="not_connected">Not connected, select radio below</string>
     <string name="connected_sleeping">Connected to radio, but it is sleeping</string>
     <string name="update_to">Update to %s</string>
+    <string name="default">Default</string>
 </resources>