diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c
index db465e2b8a..32711ee2fb 100644
--- a/frontend/platform/platform_android.c
+++ b/frontend/platform/platform_android.c
@@ -483,7 +483,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
 
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
 
-      if (*argv && *argv)
+      if (argv && *argv)
          strlcpy(config_path, argv, sizeof(config_path));
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
@@ -522,7 +522,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
       *core_path = '\0';
 
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
-      if (*argv && *argv)
+      if (argv && *argv)
          strlcpy(core_path, argv, sizeof(core_path));
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
@@ -541,7 +541,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
 
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
 
-      if (*argv && *argv)
+      if (argv && *argv)
          strlcpy(path, argv, sizeof(path));
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
@@ -563,7 +563,7 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
 
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
 
-      if (*argv && *argv)
+      if (argv && *argv)
          strlcpy(path, argv, sizeof(path));
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
diff --git a/gfx/lima_gfx.c b/gfx/lima_gfx.c
index 52733b3cfc..373f6c532f 100644
--- a/gfx/lima_gfx.c
+++ b/gfx/lima_gfx.c
@@ -493,9 +493,6 @@ static void lima_init_font(lima_video_t *vid, const char *font_path, unsigned fo
 }
 
 static void lima_render_msg(lima_video_t *vid, const char *msg) {
-  struct font_output_list out;
-  struct font_output *head;
-
   unsigned req_size;
   limare_data_t *lima = vid->lima;
 
@@ -907,12 +904,12 @@ static void lima_set_texture_enable(void *data, bool state, bool full_screen) {
   vid->menu_active = state;
 }
 
-static void lima_set_osd_msg(void *data, const char *msg, void *userdata) {
-  lima_video_t *vid = data;
+static void lima_set_osd_msg(void *data, const char *msg, const struct font_params *params) {
+  (void)data;
 
   /* TODO: what does this do? */
   (void)msg;
-  (void)userdata;
+  (void)params;
 }
 
 static void lima_show_mouse(void *data, bool state) {