diff --git a/tasks/task_database.c b/tasks/task_database.c
index ee90ba5397..e374122e87 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -350,13 +350,12 @@ static int database_info_iterate_playlist_cue(
       database_info_handle_t *db, const char *name)
 {
    int rv;
-   char track_path[PATH_MAX];
+   char track_path[PATH_MAX_LENGTH];
    int32_t offset = 0;
    const char* system_name = NULL;
-   size_t max_len = MAX_TOKEN_LEN;
    char game_id[4096];
 
-   rv = find_first_data_track(name, &offset, track_path, PATH_MAX);
+   rv = find_first_data_track(name, &offset, track_path, PATH_MAX_LENGTH);
    if (rv < 0)
    {
       RARCH_LOG("Could not find valid data track: %s\n", strerror(-rv));
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 7a7b51b830..30405cde06 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -126,10 +126,6 @@ int find_token(int fd, const char *token)
 
 int detect_ps1_game(const char *track_path, char *game_id)
 {
-   int i;
-   const char *pat_c;
-   char *c, *id_start;
-   const char *pattern = "cdrom:";
    int              fd = open(track_path, O_RDONLY);
 
    if (fd < 0)
@@ -199,10 +195,10 @@ int find_first_data_track(const char *cue_path,
    int rv;
    char tmp_token[MAX_TOKEN_LEN];
    int m, s, f;
-   char cue_dir[PATH_MAX];
+   char cue_dir[PATH_MAX_LENGTH];
    int fd = -1;
 
-   strlcpy(cue_dir, cue_path, PATH_MAX);
+   strlcpy(cue_dir, cue_path, PATH_MAX_LENGTH);
    path_basedir(cue_dir);
 
    fd = open(cue_path, O_RDONLY);