diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index f397add1a1..8a38e43dea 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -654,17 +654,20 @@ static void android_input_handle_input(void *data)
             handle_hotplug(android, android_app,
                   &android->pads_connected, id, source);
 
-         if (type_event == AINPUT_EVENT_TYPE_MOTION)
+         switch (type_event)
          {
-            if (android_input_poll_event_type_motion(android, event,
-                     port, source))
-               engine_handle_dpad(android, event, port, source);
-         }
-         else if (type_event == AINPUT_EVENT_TYPE_KEY)
-         {
-            int keycode = AKeyEvent_getKeyCode(event);
-            android_input_poll_event_type_key(android, android_app,
-                  event, port, keycode, source, type_event, &handled);
+            case AINPUT_EVENT_TYPE_MOTION:
+               if (android_input_poll_event_type_motion(android, event,
+                        port, source))
+                  engine_handle_dpad(android, event, port, source);
+               break;
+            case AINPUT_EVENT_TYPE_KEY:
+               {
+                  int keycode = AKeyEvent_getKeyCode(event);
+                  android_input_poll_event_type_key(android, android_app,
+                        event, port, keycode, source, type_event, &handled);
+               }
+               break;
          }
 
          if (!predispatched)
diff --git a/settings.c b/settings.c
index 6acf2b0ecf..250ad3fbc2 100644
--- a/settings.c
+++ b/settings.c
@@ -3595,7 +3595,6 @@ static bool setting_append_list_core_options(
    rarch_setting_group_info_t group_info;
    rarch_setting_group_info_t subgroup_info;
    settings_t *settings = config_get_ptr();
-   global_t   *global   = global_get_ptr();
 
    START_GROUP(group_info, "Core Settings");