diff --git a/apple/OSX/settings.m b/apple/OSX/settings.m
index 4f7d49f936..eebb3b3a30 100644
--- a/apple/OSX/settings.m
+++ b/apple/OSX/settings.m
@@ -272,7 +272,12 @@ NSWindowDelegate>
                case ST_BOOL:
                    return BOXINT(*setting->value.boolean);
                default:
-                   return BOXSTRING(setting_data_get_string_representation(setting, buffer, sizeof(buffer)));
+               {
+                   setting_data_get_string_representation(setting, buffer, sizeof(buffer));
+                   if (buffer[0] == '\0')
+                       strlcpy(buffer, "N/A", sizeof(buffer));
+                   return BOXSTRING(buffer);
+               }
            }
        }
    }
diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c
index 79ccc9db18..a50c2742fa 100644
--- a/frontend/menu/backend/menu_common_backend.c
+++ b/frontend/menu/backend/menu_common_backend.c
@@ -1214,6 +1214,8 @@ static int menu_settings_iterate(unsigned action, rarch_setting_t *setting)
 
    unsigned scroll_speed = (max(driver.menu->scroll_accel, 2) - 2) / 4 + 1;
    unsigned fast_scroll_speed = 4 + 4 * scroll_speed;
+    
+   (void)fast_scroll_speed;
 
    switch (action)
    {