diff --git a/Flow.Launcher.Core/Configuration/Portable.cs b/Flow.Launcher.Core/Configuration/Portable.cs
index 2d473c806..fe9ac6a0c 100644
--- a/Flow.Launcher.Core/Configuration/Portable.cs
+++ b/Flow.Launcher.Core/Configuration/Portable.cs
@@ -95,11 +95,8 @@ namespace Flow.Launcher.Core.Configuration
             }
 
             // Specify here so this method does not rely on other environment variables to initialise
-            var portableDataDir =
-                Path.Combine(Directory.GetParent(Assembly.GetExecutingAssembly().Location.NonNull()).ToString(),
-                    "UserData");
-            var roamingDataDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                "FlowLauncher");
+            var portableDataDir = DataLocation.PortableDataPath;
+            var roamingDataDir = DataLocation.RoamingDataPath;
 
 
             // Get full path to the .dead files for each case
diff --git a/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs b/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
index f25f9fe2a..1341318e0 100644
--- a/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
+++ b/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
@@ -15,6 +15,12 @@ namespace Flow.Launcher.Plugin.SharedCommands
     {
         private const string FileExplorerProgramName = "explorer";
 
+        /// <summary>
+        /// Checks if <paramref name="subPath"/> is a subpath of <paramref name="basePath"/>
+        /// </summary>
+        /// <param name="subPath"></param>
+        /// <param name="basePath"></param>
+        /// <returns></returns>
         public static bool IsSubPathOf(this string subPath, string basePath)
         {
             var rel = Path.GetRelativePath(