5 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index 536d134b0..eff68d481 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -30,9 +30,9 @@ ResultCode SharedMemory::Map(VAddr address, MemoryPermission permissions,
                 ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
     }
 
-    base_address = address;
-    permissions = permissions;
-    other_permissions = other_permissions;
+    this->base_address = address;
+    this->permissions = permissions;
+    this->other_permissions = other_permissions;
 
     return RESULT_SUCCESS;
 }
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index f9ae23e93..d393e8175 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -51,7 +51,7 @@ public:
     */
     ResultVal<u8*> GetPointer(u32 offset = 0);
 
-    VAddr base_address;                   ///< Address of shared memory block in RAM
+    VAddr base_address;                 ///< Address of shared memory block in RAM
     MemoryPermission permissions;       ///< Permissions of shared memory block (SVC field)
     MemoryPermission other_permissions; ///< Other permissions of shared memory block (SVC field)
     std::string name;                   ///< Name of shared memory object (optional)
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 03b492c75..56950ebd4 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -50,7 +50,7 @@ static void ResetThread(Thread* t, u32 arg, s32 lowest_priority) {
     memset(&t->context, 0, sizeof(Core::ThreadContext));
 
     t->context.cpu_registers[0] = arg;
-    t->context.pc = t->context.reg_15 = t->entry_point;
+    t->context.pc = t->entry_point;
     t->context.sp = t->stack_top;
     t->context.cpsr = 0x1F; // Usermode
 
diff --git a/src/core/hle/service/apt_u.cpp b/src/core/hle/service/apt_u.cpp
index 629b670ed..4c3f621d0 100644
--- a/src/core/hle/service/apt_u.cpp
+++ b/src/core/hle/service/apt_u.cpp
@@ -373,7 +373,7 @@ void SetAppCpuTimeLimit(Service::Interface* self) {
     u32 percent = cmd_buff[2];
 
     if (value != 1) {
-        LOG_ERROR(Service_APT, "This value must be one!", value);
+        LOG_ERROR(Service_APT, "This value should be one, but is actually %u!", value);
     }
 
     cmd_buff[1] = RESULT_SUCCESS.raw; // No error
@@ -395,7 +395,7 @@ void GetAppCpuTimeLimit(Service::Interface* self) {
     u32 value = cmd_buff[1];
 
     if (value != 1) {
-        LOG_ERROR(Service_APT, "This value must be one!", value);
+        LOG_ERROR(Service_APT, "This value should be one, but is actually %u!", value);
     }
 
     // TODO(purpasmart96): This is incorrect, I'm pretty sure the percentage should
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp
index 6682f6590..43eef034e 100644
--- a/src/core/hle/service/fs/archive.cpp
+++ b/src/core/hle/service/fs/archive.cpp
@@ -89,7 +89,7 @@ public:
 class File : public Kernel::Session {
 public:
     File(std::unique_ptr<FileSys::FileBackend>&& backend, const FileSys::Path& path)
-            : path(path), backend(std::move(backend)), priority(0) {
+            : path(path), priority(0), backend(std::move(backend)) {
     }
 
     std::string GetName() const override { return "Path: " + path.DebugStr(); }