diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c
index a6e6c174d5..d0119cb899 100644
--- a/frontend/drivers/platform_android.c
+++ b/frontend/drivers/platform_android.c
@@ -21,6 +21,8 @@
 #include <string.h>
 #include <sys/resource.h>
 
+#include <rhash.h>
+
 #include "platform_android.h"
 
 #include "../frontend.h"
@@ -483,8 +485,6 @@ static void frontend_android_get_environment_settings(int *argc,
       static char config_path[PATH_MAX_LENGTH] = {0};
       const char *argv = NULL;
 
-      *config_path = '\0';
-
       argv = (*env)->GetStringUTFChars(env, jstr, 0);
 
       if (argv && *argv)
@@ -751,19 +751,30 @@ static int frontend_android_get_rating(void)
    return -1;
 }
 
+#define ANDROID_ARCH_ARMV7    0x26257a91U
+#define ANDROID_ARCH_ARM      0x406a3516U
+#define ANDROID_ARCH_MIPS     0x7c9aa25eU
+#define ANDROID_ARCH_X86      0x0b88b8cbU
+
 static enum frontend_architecture frontend_android_get_architecture(void)
 {
+   uint32_t abi_hash;
    char abi[PROP_VALUE_MAX] = {0};
    system_property_get("ro.product.cpu.abi", abi);
 
-   if (!strcmp(abi, "armeabi-v7a"))
-      return FRONTEND_ARCH_ARM;
-   if (!strcmp(abi, "armeabi"))
-      return FRONTEND_ARCH_ARM;
-   if (!strcmp(abi, "mips"))
-      return FRONTEND_ARCH_MIPS;
-   if (!strcmp(abi, "x86"))
-      return FRONTEND_ARCH_X86;
+   abi_hash = djb2_calculate(abi);
+
+   switch (abi_hash)
+   {
+      case ANDROID_ARCH_ARMV7:
+         return FRONTEND_ARCH_ARM;
+      case ANDROID_ARCH_ARM:
+         return FRONTEND_ARCH_ARM;
+      case ANDROID_ARCH_MIPS:
+         return FRONTEND_ARCH_MIPS;
+      case ANDROID_ARCH_X86:
+         return FRONTEND_ARCH_X86;
+   }
 
    return FRONTEND_ARCH_NONE;
 }
diff --git a/menu/menu.c b/menu/menu.c
index 0d630009a4..8a91fbd092 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -299,7 +299,6 @@ int menu_iterate(retro_input_t input,
    runloop_t *runloop       = rarch_main_get_ptr();
    menu_handle_t *menu      = menu_driver_get_ptr();
    menu_input_t *menu_input = menu_input_get_ptr();
-   settings_t *settings     = config_get_ptr();
 
    menu_input->joypad.state    = menu_input_frame(input, trigger_input);
 
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 2975661563..253e0794e8 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -432,7 +432,6 @@ int menu_entry_iterate(unsigned action)
 int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
 {
    int ret                   = 0;
-   menu_handle_t *menu       = menu_driver_get_ptr();
    menu_navigation_t *nav    = menu_navigation_get_ptr();
    menu_display_t *disp      = menu_display_get_ptr();
    menu_list_t *menu_list    = menu_list_get_ptr();