diff --git a/frontend/drivers/platform_android.c b/frontend/drivers/platform_android.c
index c9a0494014..dfc055f0f2 100644
--- a/frontend/drivers/platform_android.c
+++ b/frontend/drivers/platform_android.c
@@ -457,7 +457,7 @@ static bool test_permissions(const char *path)
    if(ret)
       rmdir(path);
 
-   return ret;
+   return ret;
 }
 
 static void frontend_android_get_environment_settings(int *argc,
@@ -718,12 +718,12 @@ static void frontend_android_get_environment_settings(int *argc,
    if(*sdcard_dir)
    {
       if(test_permissions(sdcard_dir))
-         perms = SDCARD_ROOT_WRITABLE;
+         perms = SDCARD_ROOT_WRITABLE;
    }
    else if(*ext_dir)
    {
       if(test_permissions(ext_dir))
-         perms = SDCARD_EXT_DIR_WRITABLE;
+         perms = SDCARD_EXT_DIR_WRITABLE;
    }
    else
        perms = SDCARD_NOT_WRITABLE;
@@ -738,7 +738,7 @@ static void frontend_android_get_environment_settings(int *argc,
             fill_pathname_join(g_defaults.extraction_dir, app_dir,
                   "tmp", sizeof(g_defaults.extraction_dir));
             fill_pathname_join(g_defaults.shader_dir, app_dir,
-                  "shaders_glsl", sizeof(g_defaults.shader_dir));
+                  "shaders", sizeof(g_defaults.shader_dir));
             fill_pathname_join(g_defaults.overlay_dir, app_dir,
                   "overlays", sizeof(g_defaults.overlay_dir));
             fill_pathname_join(g_defaults.core_dir, app_dir,
@@ -768,18 +768,18 @@ static void frontend_android_get_environment_settings(int *argc,
             if(*downloads_dir && test_permissions(downloads_dir))
             {
                fill_pathname_join(g_defaults.core_assets_dir,
-                     downloads_dir, "", sizeof(g_defaults.core_assets_dir));
+                     downloads_dir, "", sizeof(g_defaults.core_assets_dir));
             }
             else
             {
                fill_pathname_join(g_defaults.core_assets_dir,
                      app_dir, "downloads", sizeof(g_defaults.core_assets_dir));
-               path_mkdir(g_defaults.core_assets_dir);
+               path_mkdir(g_defaults.core_assets_dir);
             }
             if(*screenshot_dir && test_permissions(screenshot_dir))
             {
                fill_pathname_join(g_defaults.screenshot_dir,
-                     screenshot_dir, "", sizeof(g_defaults.screenshot_dir));
+                     screenshot_dir, "", sizeof(g_defaults.screenshot_dir));
             }
             else
             {
@@ -810,7 +810,7 @@ static void frontend_android_get_environment_settings(int *argc,
                    break;
                 case SDCARD_ROOT_WRITABLE:
                 default:
-                   break;
+                   break;
             }
          }
       }