diff --git a/menu/intl/menu_hash_eo.c b/menu/intl/menu_hash_eo.c
index 76651113aa..e08b85c9f8 100644
--- a/menu/intl/menu_hash_eo.c
+++ b/menu/intl/menu_hash_eo.c
@@ -33,12 +33,15 @@ const char *menu_hash_to_str_eo(uint32_t hash)
 
 int menu_hash_get_help_eo(uint32_t hash, char *s, size_t len)
 {
+   int ret = 0;
+
    switch (hash)
    {
       case 0:
       default:
-         return -1;
+         ret = -1;
+         break;
    }
 
-   return 0;
+   return ret;
 }
diff --git a/menu/intl/menu_hash_es.c b/menu/intl/menu_hash_es.c
index 5298f245ee..5e32e0320a 100644
--- a/menu/intl/menu_hash_es.c
+++ b/menu/intl/menu_hash_es.c
@@ -33,12 +33,15 @@ const char *menu_hash_to_str_es(uint32_t hash)
 
 int menu_hash_get_help_es(uint32_t hash, char *s, size_t len)
 {
+   int ret = 0;
+
    switch (hash)
    {
       case 0:
       default:
-         return -1;
+         ret = -1;
+         break;
    }
 
-   return 0;
+   return ret;
 }
diff --git a/menu/intl/menu_hash_fr.c b/menu/intl/menu_hash_fr.c
index 672962d1da..fafcf25083 100644
--- a/menu/intl/menu_hash_fr.c
+++ b/menu/intl/menu_hash_fr.c
@@ -843,15 +843,18 @@ const char *menu_hash_to_str_fr(uint32_t hash)
 
 int menu_hash_get_help_fr(uint32_t hash, char *s, size_t len)
 {
+   int ret = 0;
    /* If this one throws errors, stop sledgehammering square pegs into round holes and */
-   /* READ THE COMMENTS at the top of the file. */ (void)sizeof(force_iso_8859_1);
+   /* READ THE COMMENTS at the top of the file. */
+   (void)sizeof(force_iso_8859_1);
 
    switch (hash)
    {
       case 0:
       default:
-         return -1;
+         ret = -1;
+         break;
    }
 
-   return 0;
+   return ret;
 }
diff --git a/menu/intl/menu_hash_it.c b/menu/intl/menu_hash_it.c
index dee12473dc..a57089dedc 100644
--- a/menu/intl/menu_hash_it.c
+++ b/menu/intl/menu_hash_it.c
@@ -33,12 +33,15 @@ const char *menu_hash_to_str_it(uint32_t hash)
 
 int menu_hash_get_help_it(uint32_t hash, char *s, size_t len)
 {
+   int ret = 0;
+
    switch (hash)
    {
       case 0:
       default:
-         return -1;
+         ret = -1;
+         break;
    }
 
-   return 0;
+   return ret;
 }
diff --git a/menu/intl/menu_hash_nl.c b/menu/intl/menu_hash_nl.c
index 6deffea69c..0e9e37e2f4 100644
--- a/menu/intl/menu_hash_nl.c
+++ b/menu/intl/menu_hash_nl.c
@@ -848,13 +848,16 @@ const char *menu_hash_to_str_nl(uint32_t hash)
 
 int menu_hash_get_help_nl(uint32_t hash, char *s, size_t len)
 {
+   int ret = 0;
+
    switch (hash)
    {
       case 0:
       default:
          strlcpy(s, "Geen informatie beschikbaar.", len);
-         return -1;
+         ret = -1;
+         break;
    }
 
-   return 0;
+   return ret;
 }
diff --git a/performance.c b/performance.c
index 1ce03e51c2..6bf2df44d7 100644
--- a/performance.c
+++ b/performance.c
@@ -406,11 +406,11 @@ unsigned rarch_get_cpu_cores(void)
 uint64_t rarch_get_cpu_features(void)
 {
    int flags[4];
-   unsigned max_flag;
-   uint64_t cpu_flags;
    int vendor_shuffle[3];
-   char vendor[13] = {0};
-   uint64_t cpu = 0;
+   char vendor[13]     = {0};
+   uint64_t cpu_flags  = 0;
+   uint64_t cpu        = 0;
+   unsigned max_flag   = 0;
 #if defined(CPU_X86)
    const int avx_flags = (1 << 27) | (1 << 28);
 #endif