diff --git a/dynamic.c b/dynamic.c
index b03ca6ff32..89015fdb22 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -613,9 +613,9 @@ static bool rarch_game_specific_options(char **output)
    core_name = system ? system->info.library_name : NULL;
    game_name = global ? path_basename(global->name.base) : NULL;
 
-   if (!core_name  || !game_name)
+   if (!core_name || !game_name)
       return false;
-   if (core_name[0] == '\0' || game_name == '\0')
+   if (core_name[0] == '\0' || game_name[0] == '\0')
       return false;
 
    RARCH_LOG("Per-game Options: core name: %s\n", core_name);
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index ed73a73573..c6d5f3cf34 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -572,7 +572,8 @@ void fill_pathname_resolve_relative(char *out_path,
 void fill_pathname_join(char *out_path,
       const char *dir, const char *path, size_t size)
 {
-   retro_assert(strlcpy(out_path, dir, size) < size);
+   if (out_path!=dir)
+      retro_assert(strlcpy(out_path, dir, size) < size);
 
    if (*out_path)
       fill_pathname_slash(out_path, size);