diff --git a/defaults.h b/defaults.h
index fb42f84502..ac8e3a6fbc 100644
--- a/defaults.h
+++ b/defaults.h
@@ -85,7 +85,7 @@ struct defaults
    {
       char config[PATH_MAX_LENGTH];
       char core[PATH_MAX_LENGTH];
-      char buildbot_server_url[PATH_MAX_LENGTH];
+      char buildbot_server_url[255];
    } path;
 
    struct
@@ -93,7 +93,7 @@ struct defaults
       int out_latency;
       float video_refresh_rate;
       bool video_threaded_enable;
-      char menu[PATH_MAX_LENGTH];
+      char menu[32];
    } settings; 
 
 #ifndef IS_SALAMANDER
diff --git a/file_path_special.c b/file_path_special.c
index 840af0d05f..4fbdb0f2f5 100644
--- a/file_path_special.c
+++ b/file_path_special.c
@@ -242,7 +242,7 @@ void fill_pathname_application_path(char *s, size_t len)
    {
       pid_t pid;
       static const char *exts[] = { "exe", "file", "path/a.out" };
-      char link_path[PATH_MAX_LENGTH];
+      char link_path[255];
 
       link_path[0] = *s = '\0';
       pid       = getpid(); 
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index 014d7a40be..7ea5ff254f 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -123,7 +123,7 @@ struct thread_packet
 
       struct
       {
-         char msg[PATH_MAX_LENGTH];
+         char msg[255];
          struct font_params params;
       } osd_message;
 
@@ -216,7 +216,7 @@ struct thread_video
       bool updated;
       bool within_thread;
       uint64_t count;
-      char msg[PATH_MAX_LENGTH];
+      char msg[255];
    } frame;
 
    video_driver_t video_thread;
diff --git a/intl/msg_hash_jp.c b/intl/msg_hash_jp.c
index bfae1a9fac..c7f2c7968b 100644
--- a/intl/msg_hash_jp.c
+++ b/intl/msg_hash_jp.c
@@ -1887,7 +1887,7 @@ static const char *menu_hash_to_str_jp_label_enum(enum msg_hash_enums msg)
    if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
          msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
    {
-      static char hotkey_lbl[PATH_MAX_LENGTH] = {0};
+      static char hotkey_lbl[128] = {0};
       unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
       snprintf(hotkey_lbl, sizeof(hotkey_lbl), "input_hotkey_binds_%d", idx);
       return hotkey_lbl;
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index de071befc8..d604afaf95 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -1889,7 +1889,7 @@ static const char *menu_hash_to_str_us_label_enum(enum msg_hash_enums msg)
    if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
          msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
    {
-      static char hotkey_lbl[PATH_MAX_LENGTH] = {0};
+      static char hotkey_lbl[128] = {0};
       unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
       snprintf(hotkey_lbl, sizeof(hotkey_lbl), "input_hotkey_binds_%d", idx);
       return hotkey_lbl;