diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
index 57164a6a31..660f2d56d0 100644
--- a/libretro-common/file/archive_file.c
+++ b/libretro-common/file/archive_file.c
@@ -62,7 +62,7 @@ static int file_archive_get_file_list_cb(
 
       /* Skip if directory. */
       if (last_char == '/' || last_char == '\\' )
-         return 0;
+         return 1;
       
       string_list_initialize(&ext_list);
       if (string_split_noalloc(&ext_list, valid_exts, "|"))
@@ -72,7 +72,7 @@ static int file_archive_get_file_list_cb(
          if (!file_ext)
          {
             string_list_deinitialize(&ext_list);
-            return 0;
+            return 1;
          }
 
          if (!string_list_find_elem_prefix(&ext_list, ".", file_ext))
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 926e837ad4..320c5a2daa 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -82,33 +82,23 @@
  */
 const char *path_get_archive_delim(const char *path)
 {
-   const char *last_slash = find_last_slash(path);
    const char *delim      = NULL;
    char buf[5];
 
    buf[0] = '\0';
 
-   /* We search for delimiters after the last slash
-    * in the file path to avoid capturing delimiter
-    * characters in any parent directory names.
-    * If there are no slashes in the file name, then
-    * the path is just the file basename - in this
-    * case we search the path in its entirety */
-   if (!last_slash)
-      last_slash = path;
-
    /* Find delimiter position
     * > Since filenames may contain '#' characters,
     *   must loop until we find the first '#' that
     *   is directly *after* a compression extension */
-   delim = strchr(last_slash, '#');
+   delim = strchr(path, '#');
 
    while (delim)
    {
       /* Check whether this is a known archive type
        * > Note: The code duplication here is
        *   deliberate, to maximise performance */
-      if (delim - last_slash > 4)
+      if (delim - path > 4)
       {
          strlcpy(buf, delim - 4, sizeof(buf));
          buf[4] = '\0';
@@ -121,7 +111,7 @@ const char *path_get_archive_delim(const char *path)
              string_is_equal(buf + 1, ".7z"))
             return delim;
       }
-      else if (delim - last_slash > 3)
+      else if (delim - path > 3)
       {
          strlcpy(buf, delim - 3, sizeof(buf));
          buf[3] = '\0';