diff --git a/configuration.c b/configuration.c
index b61cdaf8cc..042378cfbb 100644
--- a/configuration.c
+++ b/configuration.c
@@ -4471,7 +4471,7 @@ bool input_remapping_load_file(void *data, const char *path)
       char s1[64], s2[64], s3[64];
       char btn_ident[RARCH_FIRST_CUSTOM_BIND][128]       = {{0}};
       char key_ident[RARCH_FIRST_CUSTOM_BIND][128]       = {{0}};
-      char stk_ident[8][192]                             = {{0}};
+      char stk_ident[8][4096]                            = {{0}};
 
       char key_strings[RARCH_FIRST_CUSTOM_BIND + 8][128] = {
          "b", "y", "select", "start",
diff --git a/core_info.c b/core_info.c
index 252f6972da..2a6bce2f1c 100644
--- a/core_info.c
+++ b/core_info.c
@@ -1313,10 +1313,10 @@ bool core_info_hw_api_supported(core_info_t *info)
       int api_pos                = 0;
       int major_str_pos          = 0;
       int minor_str_pos          = 0;
-      int cur_api_len            = 0;
-      int j                      = 0;
       int major                  = 0;
       int minor                  = 0;
+      unsigned cur_api_len       = 0;
+      unsigned j                 = 0;
       bool found_major           = false;
       bool found_minor           = false;
       enum compare_op op         = COMPARE_OP_GREATER_EQUAL;
@@ -1336,7 +1336,8 @@ bool core_info_hw_api_supported(core_info_t *info)
          {
             case STATE_API_NAME:
             {
-               if (isupper(cur_api[j]) || islower(cur_api[j]))
+               if (  isupper((unsigned char)cur_api[j]) || 
+                     islower((unsigned char)cur_api[j]))
                   api_str[api_pos++] = cur_api[j];
                else
                {