diff --git a/app/src/main/cpp/CelestiaAppCore.cpp b/app/src/main/cpp/CelestiaAppCore.cpp
index 406fd216..e63924b1 100644
--- a/app/src/main/cpp/CelestiaAppCore.cpp
+++ b/app/src/main/cpp/CelestiaAppCore.cpp
@@ -408,7 +408,7 @@ static int convert_joystick_button(jint key)
             return CelestiaCore::JoyButton8;
         case AKEYCODE_BUTTON_A:
             return CelestiaCore::JoyButton1;
-        case AKEYCODE_BUTTON_B:
+        case AKEYCODE_BUTTON_X:
             return CelestiaCore::JoyButton2;
         default:
             return -1;
diff --git a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt
index 8671e62c..2daec22a 100644
--- a/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt
+++ b/app/src/main/java/space/celestia/mobilecelestia/MainActivity.kt
@@ -1770,7 +1770,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main),
     companion object {
         private const val CURRENT_DATA_VERSION = "26"
         // 26: 1.4.3 Localization update
-        // 25: 1.4.3 Localizaton update, data update
+        // 25: 1.4.3 Localization update, data update
         // 24: 1.4.2 Localization update
         // 23: 1.3.3 Localization update
         // 22: 1.3.0 Localization update