diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 2b3ca65af7..ab37d7ab1e 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -810,7 +810,7 @@ bool win32_window_create(void *data, unsigned style,
    notification_handler                = RegisterDeviceNotification(
 	   main_window.hwnd, &notification_filter, DEVICE_NOTIFY_WINDOW_HANDLE);
 
-   if (notification_handler)
+   if (!notification_handler)
       RARCH_ERR("Error registering for notifications\n");
 #endif
 
diff --git a/paths.c b/paths.c
index cad1e47187..ab20de391c 100644
--- a/paths.c
+++ b/paths.c
@@ -143,7 +143,7 @@ void path_set_redirect(void)
       }
    }
 
-   /* Set savefile directory if empty based on content directory */
+   /* Set savefile directory if empty to content directory */
    if (string_is_empty(new_savefile_dir) || settings->bools.savefiles_in_content_dir)
    {
       strlcpy(new_savefile_dir, path_main_basename,
@@ -319,6 +319,7 @@ static bool path_init_subsystem(void)
          {
             union string_list_elem_attr attr;
             char ext[32];
+            char savename[PATH_MAX_LENGTH];
             size_t path_size = PATH_MAX_LENGTH * sizeof(char);
             char *path       = (char*)malloc(
                   PATH_MAX_LENGTH * sizeof(char));
@@ -329,19 +330,21 @@ static bool path_init_subsystem(void)
             path[0] = ext[0] = '\0';
 
             snprintf(ext, sizeof(ext), ".%s", mem->extension);
+            strlcpy(savename, subsystem_fullpaths->elems[i].data, sizeof(savename));
+            path_remove_extension(savename);
 
-            if (path_is_directory(dir_get(RARCH_DIR_SAVEFILE)))
+            if (path_is_directory(dir_get(RARCH_DIR_CURRENT_SAVEFILE)))
             {
                /* Use SRAM dir */
                /* Redirect content fullpath to save directory. */
-               strlcpy(path, dir_get(RARCH_DIR_SAVEFILE), path_size);
+               strlcpy(path, dir_get(RARCH_DIR_CURRENT_SAVEFILE), path_size);
                fill_pathname_dir(path,
-                     subsystem_fullpaths->elems[i].data, ext,
+                     savename, ext,
                      path_size);
             }
             else
             {
-               fill_pathname(path, subsystem_fullpaths->elems[i].data,
+               fill_pathname(path, savename,
                      ext, path_size);
             }