diff --git a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
index 101cb361c9..28c66f8c9d 100644
--- a/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
+++ b/Ryujinx.HLE/HOS/Services/Acc/IAccountService.cs
@@ -319,8 +319,7 @@ namespace Ryujinx.HLE.HOS.Services.Acc
             // Account actually calls nn::arp::detail::IReader::GetApplicationControlProperty() with the current PID and store the result (NACP File) internally.
             // But since we use LibHac and we load one Application at a time, it's not necessary.
 
-            // TODO : Use "context.Device.System.ControlData.UserAccountSwitchLock" when LibHac is updated.
-            context.ResponseData.Write(false);
+            context.ResponseData.Write(context.Device.System.ControlData.UserAccountSwitchLock);
 
             Logger.PrintStub(LogClass.ServiceAcc);
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
index 81051e3c00..ac0926c9c7 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFile.cs
@@ -1,8 +1,8 @@
+using LibHac;
 using LibHac.Fs;
 using Ryujinx.HLE.HOS.Ipc;
 using System;
 using System.Collections.Generic;
-using LibHac;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
index f3acf79c31..097697c406 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystem.cs
@@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
             {
                 return ex.ResultValue.Value;
             }
-            
+
             return 0;
         }
 
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
index 37181fa636..b4e3c844b6 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IFileSystemProxy.cs
@@ -247,8 +247,7 @@ namespace Ryujinx.HLE.HOS.Services.FspSrv
 
             try
             {
-                LocalFileSystem fileSystem = new LocalFileSystem(savePath);
-
+                LocalFileSystem             fileSystem     = new LocalFileSystem(savePath);
                 DirectorySaveDataFileSystem saveFileSystem = new DirectorySaveDataFileSystem(fileSystem);
 
                 MakeObject(context, new IFileSystem(saveFileSystem));
diff --git a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
index 0f669ae2f1..2ac4d249b8 100644
--- a/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
+++ b/Ryujinx.HLE/HOS/Services/FspSrv/IStorage.cs
@@ -1,6 +1,6 @@
+using LibHac;
 using Ryujinx.HLE.HOS.Ipc;
 using System.Collections.Generic;
-using LibHac;
 
 namespace Ryujinx.HLE.HOS.Services.FspSrv
 {