diff --git a/Ryujinx.HLE/FileSystem/SaveInfo.cs b/Ryujinx.HLE/FileSystem/SaveInfo.cs
index 0547c71127..4646334a17 100644
--- a/Ryujinx.HLE/FileSystem/SaveInfo.cs
+++ b/Ryujinx.HLE/FileSystem/SaveInfo.cs
@@ -11,7 +11,8 @@ namespace Ryujinx.HLE.FileSystem
         public SaveDataType SaveDataType { get; private set; }
         public SaveSpaceId  SaveSpaceId  { get; private set; }
 
-        public SaveInfo(long TitleId,
+        public SaveInfo(
+            long         TitleId,
             long         SaveId,
             SaveDataType SaveDataType,
             UserId       UserId,
diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
index 83d641c807..c598033d4d 100644
--- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
+++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
@@ -11,8 +11,8 @@ namespace Ryujinx.HLE.FileSystem
         public const string SdCardPath = "sdmc";
         public const string SystemPath = "system";
 
-        public static string SystemNandPath = Path.Combine("nand", "system");
-        public static string UserNandPath   = Path.Combine("nand", "user");
+        public static string SystemNandPath = Path.Combine(NandPath, "system");
+        public static string UserNandPath   = Path.Combine(NandPath, "user");
 
         public Stream RomFs { get; private set; }
 
@@ -54,13 +54,15 @@ namespace Ryujinx.HLE.FileSystem
 
         public string GetSdCardPath() => MakeDirAndGetFullPath(SdCardPath);
 
-        public string GetNandPath() => MakeDirAndGetFullPath(NandPath);
-
-        public string GetGameSavePath(SaveInfo Save, ServiceCtx Context)
-            => MakeDirAndGetFullPath(SaveHelper.GetSavePath(Save, Context));
+        public string GetNandPath() => MakeDirAndGetFullPath(NandPath);        
 
         public string GetSystemPath() => MakeDirAndGetFullPath(SystemPath);
 
+        public string GetGameSavePath(SaveInfo Save, ServiceCtx Context)
+        {
+            return MakeDirAndGetFullPath(SaveHelper.GetSavePath(Save, Context));
+        }
+
         public string SwitchPathToSystemPath(string SwitchPath)
         {
             string[] Parts = SwitchPath.Split(":");
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
index f21c9b4492..937ea6d6bf 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
@@ -78,7 +78,9 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
 
             long TitleId = Context.RequestData.ReadInt64();
 
-            UserId UserId = new UserId(Context.RequestData.ReadInt64(), Context.RequestData.ReadInt64());
+            UserId UserId = new UserId(
+                Context.RequestData.ReadInt64(), 
+                Context.RequestData.ReadInt64());
 
             long SaveId = Context.RequestData.ReadInt64();