diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index e08c17118f..488c3f0dea 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -795,7 +795,8 @@ static size_t menu_action_setting_disp_set_label_input_desc(
       if (!string_is_empty(descriptor))
       {
          size_t _len = strlcpy(s, descriptor, len);
-         if (remap_idx < RARCH_FIRST_CUSTOM_BIND) { }
+         if (remap_idx < RARCH_FIRST_CUSTOM_BIND)
+            return 0;
          else if (remap_idx % 2 == 0)
             return strlcpy(s, " +", len);
          else
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 56ac3a4d38..f659eeb781 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -6726,6 +6726,8 @@ static size_t setting_get_string_representation_turbo_default_button(
             return strlcpy(s, "B", len);
          case INPUT_TURBO_DEFAULT_BUTTON_Y:
             return strlcpy(s, "Y", len);
+         case INPUT_TURBO_DEFAULT_BUTTON_A:
+            return strlcpy(s, "A", len);
          case INPUT_TURBO_DEFAULT_BUTTON_X:
             return strlcpy(s, "X", len);
          case INPUT_TURBO_DEFAULT_BUTTON_L: