diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index be8eb7d8d9..d79ecf982a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -124,6 +124,8 @@ add_library(core STATIC
     hle/service/pctl/pctl_a.h
     hle/service/service.cpp
     hle/service/service.h
+    hle/service/set/set.cpp
+    hle/service/set/set.h
     hle/service/sm/controller.cpp
     hle/service/sm/controller.h
     hle/service/sm/sm.cpp
@@ -139,8 +141,6 @@ add_library(core STATIC
     hle/service/vi/vi.h
     hle/service/vi/vi_m.cpp
     hle/service/vi/vi_m.h
-    hle/service/set/set.cpp
-    hle/service/set/set.h
     hle/shared_page.cpp
     hle/shared_page.h
     hw/hw.cpp
diff --git a/src/core/hle/service/acc/acc_u0.h b/src/core/hle/service/acc/acc_u0.h
index aa30a2a5b8..db5bcc4649 100644
--- a/src/core/hle/service/acc/acc_u0.h
+++ b/src/core/hle/service/acc/acc_u0.h
@@ -15,8 +15,8 @@ public:
     ~ACC_U0() = default;
 
 private:
-    void GetUserExistence( Kernel::HLERequestContext& ctx );
-    void GetProfile( Kernel::HLERequestContext& ctx );
+    void GetUserExistence(Kernel::HLERequestContext& ctx);
+    void GetProfile(Kernel::HLERequestContext& ctx);
     void InitializeApplicationInfo(Kernel::HLERequestContext& ctx);
     void GetBaasAccountManagerForApplication(Kernel::HLERequestContext& ctx);
 };
diff --git a/src/core/hle/service/am/applet_oe.cpp b/src/core/hle/service/am/applet_oe.cpp
index 4591e7145f..1807900367 100644
--- a/src/core/hle/service/am/applet_oe.cpp
+++ b/src/core/hle/service/am/applet_oe.cpp
@@ -316,7 +316,7 @@ private:
     }
 
     void GetDesiredLanguage(Kernel::HLERequestContext& ctx) {
-        IPC::RequestBuilder rb{ctx, 2};
+        IPC::RequestBuilder rb{ctx, 4};
         rb.Push(RESULT_SUCCESS);
         rb.Push<u64>(1); // English?
         LOG_WARNING(Service, "(STUBBED) called");
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index 082185e8a6..19213a2f40 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -24,12 +24,12 @@
 #include "core/hle/service/nvdrv/nvdrv.h"
 #include "core/hle/service/pctl/pctl.h"
 #include "core/hle/service/service.h"
+#include "core/hle/service/set/set.h"
 #include "core/hle/service/sm/controller.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/sockets/sockets.h"
 #include "core/hle/service/time/time.h"
 #include "core/hle/service/vi/vi.h"
-#include "core/hle/service/set/set.h"
 
 using Kernel::ClientPort;
 using Kernel::ServerPort;
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp
index bcdffd4ee7..08671dfd60 100644
--- a/src/core/hle/service/set/set.cpp
+++ b/src/core/hle/service/set/set.cpp
@@ -13,20 +13,20 @@ namespace Service {
 namespace Set {
 
 void SET::GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx) {
-    constexpr u8 data[13] = {
+    constexpr std::array<u8, 13> lang_codes{{
         0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    };
+    }};
 
     const auto& output_buffer = ctx.BufferDescriptorC()[0];
 
-    Memory::WriteBlock( output_buffer.Address(), data, sizeof( data ) );
+    Memory::WriteBlock(output_buffer.Address(), lang_codes.data(), lang_codes.size());
 
-    IPC::RequestBuilder rb{ ctx, 4 };
+    IPC::RequestBuilder rb{ctx, 4};
 
-    rb.Push( RESULT_SUCCESS );
-    rb.Push( static_cast<u64>( sizeof( data ) ) );
+    rb.Push(RESULT_SUCCESS);
+    rb.Push(static_cast<u64>(lang_codes.size()));
 
-    LOG_WARNING( Service, "(STUBBED) called" );
+    LOG_WARNING(Service, "(STUBBED) called");
 }
 
 SET::SET(const char* name) : ServiceFramework(name) {
diff --git a/src/core/hle/service/set/set.h b/src/core/hle/service/set/set.h
index 60fb37d882..61e9579463 100644
--- a/src/core/hle/service/set/set.h
+++ b/src/core/hle/service/set/set.h
@@ -18,7 +18,7 @@ private:
     void GetAvailableLanguageCodes(Kernel::HLERequestContext& ctx);
 };
 
-/// Registers all Time services with the specified service manager.
+/// Registers all Set services with the specified service manager.
 void InstallInterfaces(SM::ServiceManager& service_manager);
 
 } // namespace Set