54 files changed, 322 insertions, 433 deletions
diff --git a/src/core/hle/ipc_helpers.h b/src/core/hle/ipc_helpers.h
index fcb86c822..1c354037d 100644
--- a/src/core/hle/ipc_helpers.h
+++ b/src/core/hle/ipc_helpers.h
@@ -233,7 +233,7 @@ void ResponseBuilder::PushRaw(const T& value) {
    static_assert(std::is_trivially_copyable_v<T>,
                  "It's undefined behavior to use memcpy with non-trivially copyable objects");
    std::memcpy(cmdbuf + index, &value, sizeof(T));
-    index += static_cast<std::ptrdiff_t>((sizeof(T) + 3) / 4); // round up to word length
+    index += (sizeof(T) + 3) / 4; // round up to word length
 }
 template <>
@@ -390,7 +390,7 @@ void RequestParser::PopRaw(T& value) {
    static_assert(std::is_trivially_copyable_v<T>,
                  "It's undefined behavior to use memcpy with non-trivially copyable objects");
    std::memcpy(&value, cmdbuf + index, sizeof(T));
-    index += static_cast<std::ptrdiff_t>((sizeof(T) + 3) / 4); // round up to word length
+    index += (sizeof(T) + 3) / 4; // round up to word length
 }
 template <typename T>
diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp
index b6ebc5329..b882eaa0f 100644
--- a/src/core/hle/kernel/address_arbiter.cpp
+++ b/src/core/hle/kernel/address_arbiter.cpp
@@ -108,7 +108,7 @@ ResultCode AddressArbiter::ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr a
    auto& monitor = system.Monitor();
    s32 updated_value;
    do {
-        updated_value = static_cast<s32>(monitor.ExclusiveRead32(current_core, address));
+        updated_value = monitor.ExclusiveRead32(current_core, address);
        if (updated_value != value) {
            return ERR_INVALID_STATE;
@@ -129,7 +129,7 @@ ResultCode AddressArbiter::ModifyByWaitingCountAndSignalToAddressIfEqual(VAddr a
                updated_value = value;
            }
        }
-    } while (!monitor.ExclusiveWrite32(current_core, address, static_cast<u32>(updated_value)));
+    } while (!monitor.ExclusiveWrite32(current_core, address, updated_value));
    WakeThreads(waiting_threads, num_to_wake);
    return RESULT_SUCCESS;
diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp
index fe4988f84..3e745c18b 100644
--- a/src/core/hle/kernel/handle_table.cpp
+++ b/src/core/hle/kernel/handle_table.cpp
@@ -68,7 +68,7 @@ ResultVal<Handle> HandleTable::Create(std::shared_ptr<Object> obj) {
    generations[slot] = generation;
    objects[slot] = std::move(obj);
-    const auto handle = static_cast<Handle>(generation | static_cast<u16>(slot << 15));
+    Handle handle = generation | (slot << 15);
    return MakeResult<Handle>(handle);
 }
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 0a2de4270..81f85643b 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -58,7 +58,7 @@ std::shared_ptr<WritableEvent> HLERequestContext::SleepClientThread(
    {
        Handle event_handle = InvalidHandle;
-        SchedulerLockAndSleep lock(kernel, event_handle, thread.get(), static_cast<s64>(timeout));
+        SchedulerLockAndSleep lock(kernel, event_handle, thread.get(), timeout);
        thread->SetHLECallback(
            [context = *this, callback](std::shared_ptr<Thread> thread) mutable -> bool {
                ThreadWakeupReason reason = thread->GetSignalingResult() == RESULT_TIMEOUT
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 56e14da6b..b2b5b8adf 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -171,7 +171,7 @@ struct KernelCore::Impl {
            const auto type =
                static_cast<ThreadType>(THREADTYPE_KERNEL | THREADTYPE_HLE | THREADTYPE_SUSPEND);
            auto thread_res =
-                Thread::Create(system, type, std::move(name), 0, 0, 0, static_cast<s32>(i), 0,
+                Thread::Create(system, type, std::move(name), 0, 0, 0, static_cast<u32>(i), 0,
                               nullptr, std::move(init_func), init_func_parameter);
            suspend_threads[i] = std::move(thread_res).Unwrap();
diff --git a/src/core/hle/kernel/memory/address_space_info.cpp b/src/core/hle/kernel/memory/address_space_info.cpp
index 6cf43ba24..e4288cab4 100644
--- a/src/core/hle/kernel/memory/address_space_info.cpp
+++ b/src/core/hle/kernel/memory/address_space_info.cpp
@@ -96,7 +96,6 @@ u64 AddressSpaceInfo::GetAddressSpaceStart(std::size_t width, Type type) {
        return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].address;
    }
    UNREACHABLE();
-    return 0;
 }
 std::size_t AddressSpaceInfo::GetAddressSpaceSize(std::size_t width, Type type) {
@@ -113,7 +112,6 @@ std::size_t AddressSpaceInfo::GetAddressSpaceSize(std::size_t width, Type type)
        return AddressSpaceInfos[AddressSpaceIndices39Bit[index]].size;
    }
    UNREACHABLE();
-    return 0;
 }
 } // namespace Kernel::Memory
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp
index a96157c37..acf13585c 100644
--- a/src/core/hle/kernel/memory/memory_manager.cpp
+++ b/src/core/hle/kernel/memory/memory_manager.cpp
@@ -71,7 +71,7 @@ VAddr MemoryManager::AllocateContinuous(std::size_t num_pages, std::size_t align
    }
    // If we allocated more than we need, free some
-    const auto allocated_pages{PageHeap::GetBlockNumPages(static_cast<u32>(heap_index))};
+    const auto allocated_pages{PageHeap::GetBlockNumPages(heap_index)};
    if (allocated_pages > num_pages) {
        chosen_manager.Free(allocated_block + num_pages * PageSize, allocated_pages - num_pages);
    }
@@ -112,7 +112,7 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa
    // Keep allocating until we've allocated all our pages
    for (s32 index{heap_index}; index >= 0 && num_pages > 0; index--) {
-        const auto pages_per_alloc{PageHeap::GetBlockNumPages(static_cast<u32>(index))};
+        const auto pages_per_alloc{PageHeap::GetBlockNumPages(index)};
        while (num_pages >= pages_per_alloc) {
            // Allocate a block
diff --git a/src/core/hle/kernel/memory/page_heap.cpp b/src/core/hle/kernel/memory/page_heap.cpp
index 7890b8c1a..0ab1f7205 100644
--- a/src/core/hle/kernel/memory/page_heap.cpp
+++ b/src/core/hle/kernel/memory/page_heap.cpp
@@ -33,12 +33,11 @@ void PageHeap::Initialize(VAddr address, std::size_t size, std::size_t metadata_
 }
 VAddr PageHeap::AllocateBlock(s32 index) {
-    const auto u_index = static_cast<std::size_t>(index);
+    const std::size_t needed_size{blocks[index].GetSize()};
-    const auto needed_size{blocks[u_index].GetSize()};
-    for (auto i = u_index; i < MemoryBlockPageShifts.size(); i++) {
+    for (s32 i{index}; i < static_cast<s32>(MemoryBlockPageShifts.size()); i++) {
-        if (const VAddr addr = blocks[i].PopBlock(); addr != 0) {
+        if (const VAddr addr{blocks[i].PopBlock()}; addr) {
-            if (const std::size_t allocated_size = blocks[i].GetSize();
+            if (const std::size_t allocated_size{blocks[i].GetSize()};
                allocated_size > needed_size) {
                Free(addr + needed_size, (allocated_size - needed_size) / PageSize);
            }
@@ -51,7 +50,7 @@ VAddr PageHeap::AllocateBlock(s32 index) {
 void PageHeap::FreeBlock(VAddr block, s32 index) {
    do {
-        block = blocks[static_cast<std::size_t>(index++)].PushBlock(block);
+        block = blocks[index++].PushBlock(block);
    } while (block != 0);
 }
@@ -70,7 +69,7 @@ void PageHeap::Free(VAddr addr, std::size_t num_pages) {
    VAddr after_start{end};
    VAddr after_end{end};
    while (big_index >= 0) {
-        const std::size_t block_size{blocks[static_cast<std::size_t>(big_index)].GetSize()};
+        const std::size_t block_size{blocks[big_index].GetSize()};
        const VAddr big_start{Common::AlignUp((start), block_size)};
        const VAddr big_end{Common::AlignDown((end), block_size)};
        if (big_start < big_end) {
@@ -88,7 +87,7 @@ void PageHeap::Free(VAddr addr, std::size_t num_pages) {
    // Free space before the big blocks
    for (s32 i{big_index - 1}; i >= 0; i--) {
-        const std::size_t block_size{blocks[static_cast<size_t>(i)].GetSize()};
+        const std::size_t block_size{blocks[i].GetSize()};
        while (before_start + block_size <= before_end) {
            before_end -= block_size;
            FreeBlock(before_end, i);
@@ -97,7 +96,7 @@ void PageHeap::Free(VAddr addr, std::size_t num_pages) {
    // Free space after the big blocks
    for (s32 i{big_index - 1}; i >= 0; i--) {
-        const std::size_t block_size{blocks[static_cast<size_t>(i)].GetSize()};
+        const std::size_t block_size{blocks[i].GetSize()};
        while (after_start + block_size <= after_end) {
            FreeBlock(after_start, i);
            after_start += block_size;
diff --git a/src/core/hle/kernel/memory/page_heap.h b/src/core/hle/kernel/memory/page_heap.h
index 92a2bce04..22b0de860 100644
--- a/src/core/hle/kernel/memory/page_heap.h
+++ b/src/core/hle/kernel/memory/page_heap.h
@@ -34,9 +34,7 @@ public:
    static constexpr s32 GetBlockIndex(std::size_t num_pages) {
        for (s32 i{static_cast<s32>(NumMemoryBlockPageShifts) - 1}; i >= 0; i--) {
-            const auto shift_index = static_cast<std::size_t>(i);
+            if (num_pages >= (static_cast<std::size_t>(1) << MemoryBlockPageShifts[i]) / PageSize) {
-            if (num_pages >=
-                (static_cast<std::size_t>(1) << MemoryBlockPageShifts[shift_index]) / PageSize) {
                return i;
            }
        }
@@ -88,7 +86,7 @@ private:
                // Set the bitmap pointers
                for (s32 depth{GetHighestDepthIndex()}; depth >= 0; depth--) {
-                    bit_storages[static_cast<std::size_t>(depth)] = storage;
+                    bit_storages[depth] = storage;
                    size = Common::AlignUp(size, 64) / 64;
                    storage += size;
                }
@@ -101,7 +99,7 @@ private:
                s32 depth{};
                do {
-                    const u64 v{bit_storages[static_cast<std::size_t>(depth)][offset]};
+                    const u64 v{bit_storages[depth][offset]};
                    if (v == 0) {
                        // Non-zero depth indicates that a previous level had a free block
                        ASSERT(depth == 0);
@@ -127,7 +125,7 @@ private:
            constexpr bool ClearRange(std::size_t offset, std::size_t count) {
                const s32 depth{GetHighestDepthIndex()};
                const auto bit_ind{offset / 64};
-                u64* bits{bit_storages[static_cast<std::size_t>(depth)]};
+                u64* bits{bit_storages[depth]};
                if (count < 64) {
                    const auto shift{offset % 64};
                    ASSERT(shift + count <= 64);
@@ -179,11 +177,11 @@ private:
                    const auto which{offset % 64};
                    const u64 mask{1ULL << which};
-                    u64* bit{std::addressof(bit_storages[static_cast<std::size_t>(depth)][ind])};
+                    u64* bit{std::addressof(bit_storages[depth][ind])};
                    const u64 v{*bit};
                    ASSERT((v & mask) == 0);
                    *bit = v | mask;
-                    if (v != 0) {
+                    if (v) {
                        break;
                    }
                    offset = ind;
@@ -197,12 +195,12 @@ private:
                    const auto which{offset % 64};
                    const u64 mask{1ULL << which};
-                    u64* bit{std::addressof(bit_storages[static_cast<std::size_t>(depth)][ind])};
+                    u64* bit{std::addressof(bit_storages[depth][ind])};
                    u64 v{*bit};
                    ASSERT((v & mask) != 0);
                    v &= ~mask;
                    *bit = v;
-                    if (v != 0) {
+                    if (v) {
                        break;
                    }
                    offset = ind;
diff --git a/src/core/hle/kernel/memory/page_table.cpp b/src/core/hle/kernel/memory/page_table.cpp
index 4f759d078..a3fadb533 100644
--- a/src/core/hle/kernel/memory/page_table.cpp
+++ b/src/core/hle/kernel/memory/page_table.cpp
@@ -414,8 +414,7 @@ ResultCode PageTable::MapPhysicalMemory(VAddr addr, std::size_t size) {
    const std::size_t remaining_pages{remaining_size / PageSize};
    if (process->GetResourceLimit() &&
-        !process->GetResourceLimit()->Reserve(ResourceType::PhysicalMemory,
+        !process->GetResourceLimit()->Reserve(ResourceType::PhysicalMemory, remaining_size)) {
-                                              static_cast<s64>(remaining_size))) {
        return ERR_RESOURCE_LIMIT_EXCEEDED;
    }
@@ -779,8 +778,7 @@ ResultVal<VAddr> PageTable::SetHeapSize(std::size_t size) {
        auto process{system.Kernel().CurrentProcess()};
        if (process->GetResourceLimit() && delta != 0 &&
-            !process->GetResourceLimit()->Reserve(ResourceType::PhysicalMemory,
+            !process->GetResourceLimit()->Reserve(ResourceType::PhysicalMemory, delta)) {
-                                                  static_cast<s64>(delta))) {
            return ERR_RESOURCE_LIMIT_EXCEEDED;
        }
diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h
index 6cb59d0fc..d7a7a951c 100644
--- a/src/core/hle/kernel/physical_core.h
+++ b/src/core/hle/kernel/physical_core.h
@@ -34,7 +34,7 @@ public:
    PhysicalCore& operator=(const PhysicalCore&) = delete;
    PhysicalCore(PhysicalCore&&) = default;
-    PhysicalCore& operator=(PhysicalCore&&) = delete;
+    PhysicalCore& operator=(PhysicalCore&&) = default;
    void Idle();
    /// Interrupt this physical core.
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 0b39f2955..ff9d9248b 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -137,10 +137,9 @@ std::shared_ptr<ResourceLimit> Process::GetResourceLimit() const {
 }
 u64 Process::GetTotalPhysicalMemoryAvailable() const {
-    const u64 capacity{
+    const u64 capacity{resource_limit->GetCurrentResourceValue(ResourceType::PhysicalMemory) +
-        static_cast<u64>(resource_limit->GetCurrentResourceValue(ResourceType::PhysicalMemory)) +
+                       page_table->GetTotalHeapSize() + GetSystemResourceSize() + image_size +
-        page_table->GetTotalHeapSize() + GetSystemResourceSize() + image_size +
+                       main_thread_stack_size};
-        main_thread_stack_size};
    if (capacity < memory_usage_capacity) {
        return capacity;
@@ -280,12 +279,12 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata,
    // Set initial resource limits
    resource_limit->SetLimitValue(
        ResourceType::PhysicalMemory,
-        static_cast<s64>(kernel.MemoryManager().GetSize(Memory::MemoryManager::Pool::Application)));
+        kernel.MemoryManager().GetSize(Memory::MemoryManager::Pool::Application));
    resource_limit->SetLimitValue(ResourceType::Threads, 608);
    resource_limit->SetLimitValue(ResourceType::Events, 700);
    resource_limit->SetLimitValue(ResourceType::TransferMemory, 128);
    resource_limit->SetLimitValue(ResourceType::Sessions, 894);
-    ASSERT(resource_limit->Reserve(ResourceType::PhysicalMemory, static_cast<s64>(code_size)));
+    ASSERT(resource_limit->Reserve(ResourceType::PhysicalMemory, code_size));
    // Create TLS region
    tls_region_address = CreateTLSRegion();
@@ -301,9 +300,9 @@ void Process::Run(s32 main_thread_priority, u64 stack_size) {
    ChangeStatus(ProcessStatus::Running);
-    SetupMainThread(system, *this, static_cast<u32>(main_thread_priority), main_thread_stack_top);
+    SetupMainThread(system, *this, main_thread_priority, main_thread_stack_top);
    resource_limit->Reserve(ResourceType::Threads, 1);
-    resource_limit->Reserve(ResourceType::PhysicalMemory, static_cast<s64>(main_thread_stack_size));
+    resource_limit->Reserve(ResourceType::PhysicalMemory, main_thread_stack_size);
 }
 void Process::PrepareForTermination() {
@@ -364,7 +363,7 @@ VAddr Process::CreateTLSRegion() {
            ->AllocateAndMapMemory(1, Memory::PageSize, true, start, size / Memory::PageSize,
                                   Memory::MemoryState::ThreadLocal,
                                   Memory::MemoryPermission::ReadAndWrite, tls_map_addr)
-            .ValueOr(0U)};
+            .ValueOr(0)};
    ASSERT(tls_page_addr);
diff --git a/src/core/hle/kernel/resource_limit.cpp b/src/core/hle/kernel/resource_limit.cpp
index e94093f24..212e442f4 100644
--- a/src/core/hle/kernel/resource_limit.cpp
+++ b/src/core/hle/kernel/resource_limit.cpp
@@ -43,8 +43,8 @@ void ResourceLimit::Release(ResourceType resource, u64 amount) {
 void ResourceLimit::Release(ResourceType resource, u64 used_amount, u64 available_amount) {
    const std::size_t index{ResourceTypeToIndex(resource)};
-    current[index] -= static_cast<s64>(used_amount);
+    current[index] -= used_amount;
-    available[index] -= static_cast<s64>(available_amount);
+    available[index] -= available_amount;
 }
 std::shared_ptr<ResourceLimit> ResourceLimit::Create(KernelCore& kernel) {
diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp
index 4a9a762f3..6b7db5372 100644
--- a/src/core/hle/kernel/scheduler.cpp
+++ b/src/core/hle/kernel/scheduler.cpp
@@ -89,11 +89,9 @@ u32 GlobalScheduler::SelectThreads() {
            while (iter != suggested_queue[core_id].end()) {
                suggested = *iter;
                iter++;
-                const s32 suggested_core_id = suggested->GetProcessorID();
+                s32 suggested_core_id = suggested->GetProcessorID();
-                Thread* top_thread = suggested_core_id >= 0
+                Thread* top_thread =
-                                         ? top_threads[static_cast<u32>(suggested_core_id)]
+                    suggested_core_id >= 0 ? top_threads[suggested_core_id] : nullptr;
-                                         : nullptr;
                if (top_thread != suggested) {
                    if (top_thread != nullptr &&
                        top_thread->GetPriority() < THREADPRIO_MAX_CORE_MIGRATION) {
@@ -104,19 +102,16 @@ u32 GlobalScheduler::SelectThreads() {
                    TransferToCore(suggested->GetPriority(), static_cast<s32>(core_id), suggested);
                    break;
                }
                suggested = nullptr;
                migration_candidates[num_candidates++] = suggested_core_id;
            }
            // Step 3: Select a suggested thread from another core
            if (suggested == nullptr) {
                for (std::size_t i = 0; i < num_candidates; i++) {
-                    const auto candidate_core = static_cast<u32>(migration_candidates[i]);
+                    s32 candidate_core = migration_candidates[i];
                    suggested = top_threads[candidate_core];
                    auto it = scheduled_queue[candidate_core].begin();
-                    ++it;
+                    it++;
                    Thread* next = it != scheduled_queue[candidate_core].end() ? *it : nullptr;
                    if (next != nullptr) {
                        TransferToCore(suggested->GetPriority(), static_cast<s32>(core_id),
@@ -133,8 +128,7 @@ u32 GlobalScheduler::SelectThreads() {
        idle_cores &= ~(1U << core_id);
    }
+    u32 cores_needing_context_switch{};
-    u32 cores_needing_context_switch = 0;
    for (u32 core = 0; core < Core::Hardware::NUM_CPU_CORES; core++) {
        Scheduler& sched = kernel.Scheduler(core);
        ASSERT(top_threads[core] == nullptr ||
@@ -192,16 +186,13 @@ bool GlobalScheduler::YieldThreadAndBalanceLoad(Thread* yielding_thread) {
    for (auto& thread : suggested_queue[core_id]) {
        const s32 source_core = thread->GetProcessorID();
        if (source_core >= 0) {
-            const auto sanitized_source_core = static_cast<u32>(source_core);
+            if (current_threads[source_core] != nullptr) {
+                if (thread == current_threads[source_core] ||
-            if (current_threads[sanitized_source_core] != nullptr) {
+                    current_threads[source_core]->GetPriority() < min_regular_priority) {
-                if (thread == current_threads[sanitized_source_core] ||
-                    current_threads[sanitized_source_core]->GetPriority() < min_regular_priority) {
                    continue;
                }
            }
        }
        if (next_thread->GetLastRunningTicks() >= thread->GetLastRunningTicks() ||
            next_thread->GetPriority() < thread->GetPriority()) {
            if (thread->GetPriority() <= priority) {
@@ -249,25 +240,17 @@ bool GlobalScheduler::YieldThreadAndWaitForLoadBalancing(Thread* yielding_thread
        for (std::size_t i = 0; i < current_threads.size(); i++) {
            current_threads[i] = scheduled_queue[i].empty() ? nullptr : scheduled_queue[i].front();
        }
        for (auto& thread : suggested_queue[core_id]) {
            const s32 source_core = thread->GetProcessorID();
-            if (source_core < 0) {
+            if (source_core < 0 || thread == current_threads[source_core]) {
-                continue;
-            }
-            const auto sanitized_source_core = static_cast<u32>(source_core);
-            if (thread == current_threads[sanitized_source_core]) {
                continue;
            }
+            if (current_threads[source_core] == nullptr ||
-            if (current_threads[sanitized_source_core] == nullptr ||
+                current_threads[source_core]->GetPriority() >= min_regular_priority) {
-                current_threads[sanitized_source_core]->GetPriority() >= min_regular_priority) {
                winner = thread;
            }
            break;
        }
        if (winner != nullptr) {
            if (winner != yielding_thread) {
                TransferToCore(winner->GetPriority(), static_cast<s32>(core_id), winner);
@@ -309,22 +292,17 @@ void GlobalScheduler::PreemptThreads() {
            if (thread->GetPriority() != priority) {
                continue;
            }
            if (source_core >= 0) {
-                const auto sanitized_source_core = static_cast<u32>(source_core);
+                Thread* next_thread = scheduled_queue[source_core].empty()
-                Thread* next_thread = scheduled_queue[sanitized_source_core].empty()
                                          ? nullptr
-                                          : scheduled_queue[sanitized_source_core].front();
+                                          : scheduled_queue[source_core].front();
                if (next_thread != nullptr && next_thread->GetPriority() < 2) {
                    break;
                }
                if (next_thread == thread) {
                    continue;
                }
            }
            if (current_thread != nullptr &&
                current_thread->GetLastRunningTicks() >= thread->GetLastRunningTicks()) {
                winner = thread;
@@ -344,22 +322,17 @@ void GlobalScheduler::PreemptThreads() {
                if (thread->GetPriority() < priority) {
                    continue;
                }
                if (source_core >= 0) {
-                    const auto sanitized_source_core = static_cast<u32>(source_core);
+                    Thread* next_thread = scheduled_queue[source_core].empty()
-                    Thread* next_thread = scheduled_queue[sanitized_source_core].empty()
                                              ? nullptr
-                                              : scheduled_queue[sanitized_source_core].front();
+                                              : scheduled_queue[source_core].front();
                    if (next_thread != nullptr && next_thread->GetPriority() < 2) {
                        break;
                    }
                    if (next_thread == thread) {
                        continue;
                    }
                }
                if (current_thread != nullptr &&
                    current_thread->GetLastRunningTicks() >= thread->GetLastRunningTicks()) {
                    winner = thread;
@@ -379,11 +352,11 @@ void GlobalScheduler::PreemptThreads() {
 void GlobalScheduler::EnableInterruptAndSchedule(u32 cores_pending_reschedule,
                                                 Core::EmuThreadHandle global_thread) {
-    const u32 current_core = global_thread.host_handle;
+    u32 current_core = global_thread.host_handle;
    bool must_context_switch = global_thread.guest_handle != InvalidHandle &&
                               (current_core < Core::Hardware::NUM_CPU_CORES);
    while (cores_pending_reschedule != 0) {
-        const u32 core = Common::CountTrailingZeroes32(cores_pending_reschedule);
+        u32 core = Common::CountTrailingZeroes32(cores_pending_reschedule);
        ASSERT(core < Core::Hardware::NUM_CPU_CORES);
        if (!must_context_switch || core != current_core) {
            auto& phys_core = kernel.PhysicalCore(core);
@@ -393,7 +366,6 @@ void GlobalScheduler::EnableInterruptAndSchedule(u32 cores_pending_reschedule,
        }
        cores_pending_reschedule &= ~(1U << core);
    }
    if (must_context_switch) {
        auto& core_scheduler = kernel.CurrentScheduler();
        kernel.ExitSVCProfile();
@@ -831,11 +803,9 @@ void Scheduler::Initialize() {
    std::string name = "Idle Thread Id:" + std::to_string(core_id);
    std::function<void(void*)> init_func = Core::CpuManager::GetIdleThreadStartFunc();
    void* init_func_parameter = system.GetCpuManager().GetStartFuncParamater();
-    const auto type = static_cast<ThreadType>(THREADTYPE_KERNEL | THREADTYPE_HLE | THREADTYPE_IDLE);
+    ThreadType type = static_cast<ThreadType>(THREADTYPE_KERNEL | THREADTYPE_HLE | THREADTYPE_IDLE);
-    auto thread_res =
+    auto thread_res = Thread::Create(system, type, name, 0, 64, 0, static_cast<u32>(core_id), 0,
-        Thread::Create(system, type, std::move(name), 0, 64, 0, static_cast<s32>(core_id), 0,
+                                     nullptr, std::move(init_func), init_func_parameter);
-                       nullptr, std::move(init_func), init_func_parameter);
    idle_thread = std::move(thread_res).Unwrap();
 }
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index b8623e831..bafd1ced7 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -482,8 +482,7 @@ static ResultCode WaitSynchronization(Core::System& system, Handle* index, VAddr
 static ResultCode WaitSynchronization32(Core::System& system, u32 timeout_low, u32 handles_address,
                                        s32 handle_count, u32 timeout_high, Handle* index) {
    const s64 nano_seconds{(static_cast<s64>(timeout_high) << 32) | static_cast<s64>(timeout_low)};
-    return WaitSynchronization(system, index, handles_address, static_cast<u32>(handle_count),
+    return WaitSynchronization(system, index, handles_address, handle_count, nano_seconds);
-                               nano_seconds);
 }
 /// Resumes a thread waiting on WaitSynchronization
@@ -2003,7 +2002,7 @@ static ResultCode GetThreadCoreMask(Core::System& system, Handle thread_handle,
        return ERR_INVALID_HANDLE;
    }
-    *core = static_cast<u32>(thread->GetIdealCore());
+    *core = thread->GetIdealCore();
    *mask = thread->GetAffinityMask();
    return RESULT_SUCCESS;
@@ -2071,7 +2070,7 @@ static ResultCode SetThreadCoreMask(Core::System& system, Handle thread_handle,
        return ERR_INVALID_HANDLE;
    }
-    return thread->SetCoreAndAffinityMask(static_cast<s32>(core), affinity_mask);
+    return thread->SetCoreAndAffinityMask(core, affinity_mask);
 }
 static ResultCode SetThreadCoreMask32(Core::System& system, Handle thread_handle, u32 core,
diff --git a/src/core/hle/kernel/svc_wrap.h b/src/core/hle/kernel/svc_wrap.h
index 9284a4c84..0b6dd9df0 100644
--- a/src/core/hle/kernel/svc_wrap.h
+++ b/src/core/hle/kernel/svc_wrap.h
@@ -11,11 +11,11 @@
 namespace Kernel {
-static inline u64 Param(const Core::System& system, std::size_t n) {
+static inline u64 Param(const Core::System& system, int n) {
    return system.CurrentArmInterface().GetReg(n);
 }
-static inline u32 Param32(const Core::System& system, std::size_t n) {
+static inline u32 Param32(const Core::System& system, int n) {
    return static_cast<u32>(system.CurrentArmInterface().GetReg(n));
 }
@@ -29,7 +29,7 @@ static inline void FuncReturn(Core::System& system, u64 result) {
 }
 static inline void FuncReturn32(Core::System& system, u32 result) {
-    system.CurrentArmInterface().SetReg(0, static_cast<u64>(result));
+    system.CurrentArmInterface().SetReg(0, (u64)result);
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -386,10 +386,9 @@ template <ResultCode func(Core::System&, Handle*, u32, u32, u32, u32, s32)>
 void SvcWrap32(Core::System& system) {
    Handle param_1 = 0;
-    const u32 retval =
+    const u32 retval = func(system, &param_1, Param32(system, 0), Param32(system, 1),
-        func(system, &param_1, Param32(system, 0), Param32(system, 1), Param32(system, 2),
+                            Param32(system, 2), Param32(system, 3), Param32(system, 4))
-             Param32(system, 3), static_cast<s32>(Param32(system, 4)))
+                           .raw;
-            .raw;
    system.CurrentArmInterface().SetReg(1, param_1);
    FuncReturn(system, retval);
@@ -543,8 +542,8 @@ void SvcWrap32(Core::System& system) {
 template <ResultCode func(Core::System&, u32, u32, s32, u32, Handle*)>
 void SvcWrap32(Core::System& system) {
    u32 param_1 = 0;
-    const u32 retval = func(system, Param32(system, 0), Param32(system, 1),
+    const u32 retval = func(system, Param32(system, 0), Param32(system, 1), Param32(system, 2),
-                            static_cast<s32>(Param32(system, 2)), Param32(system, 3), &param_1)
+                            Param32(system, 3), &param_1)
                           .raw;
    system.CurrentArmInterface().SetReg(1, param_1);
    FuncReturn(system, retval);
diff --git a/src/core/hle/kernel/synchronization.cpp b/src/core/hle/kernel/synchronization.cpp
index 653f722b3..8b875d853 100644
--- a/src/core/hle/kernel/synchronization.cpp
+++ b/src/core/hle/kernel/synchronization.cpp
@@ -51,7 +51,7 @@ std::pair<ResultCode, Handle> Synchronization::WaitFor(
            // We found a ready object, acquire it and set the result value
            SynchronizationObject* object = itr->get();
            object->Acquire(thread);
-            const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr));
+            const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr));
            lock.CancelSleep();
            return {RESULT_SUCCESS, index};
        }
@@ -105,7 +105,7 @@ std::pair<ResultCode, Handle> Synchronization::WaitFor(
                });
            ASSERT(itr != sync_objects.end());
            signaling_object->Acquire(thread);
-            const auto index = static_cast<u32>(std::distance(sync_objects.begin(), itr));
+            const u32 index = static_cast<s32>(std::distance(sync_objects.begin(), itr));
            return {signaling_result, index};
        }
        return {signaling_result, -1};
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 323e740e9..d132aba34 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -525,7 +525,7 @@ ResultCode Thread::SetCoreAndAffinityMask(s32 new_core, u64 new_affinity_mask) {
        if (old_affinity_mask != new_affinity_mask) {
            const s32 old_core = processor_id;
            if (processor_id >= 0 && ((affinity_mask >> processor_id) & 1) == 0) {
-                if (ideal_core < 0) {
+                if (static_cast<s32>(ideal_core) < 0) {
                    processor_id = HighestSetCore(affinity_mask, Core::Hardware::NUM_CPU_CORES);
                } else {
                    processor_id = ideal_core;
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 21b22ca45..8daf79fac 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -470,7 +470,7 @@ public:
    bool InvokeHLECallback(std::shared_ptr<Thread> thread);
-    s32 GetIdealCore() const {
+    u32 GetIdealCore() const {
        return ideal_core;
    }
@@ -654,8 +654,8 @@ private:
    Scheduler* scheduler = nullptr;
-    s32 ideal_core = -1;
+    u32 ideal_core{0xFFFFFFFF};
-    u64 affinity_mask = 1;
+    u64 affinity_mask{0x1};
    s32 ideal_core_override = -1;
    u64 affinity_mask_override = 0x1;
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index 9c302043a..9b829e957 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -41,15 +41,12 @@ constexpr char ACC_SAVE_AVATORS_BASE_PATH[] = "/system/save/8000000000000010/su/
 ProfileManager::ProfileManager() {
    ParseUserSaveFile();
-    if (user_count == 0) {
+    if (user_count == 0)
        CreateNewUser(UUID::Generate(), "yuzu");
-    }
-    auto current = static_cast<size_t>(
+    auto current = std::clamp<int>(Settings::values.current_user, 0, MAX_USERS - 1);
-        std::clamp(Settings::values.current_user, 0, static_cast<s32>(MAX_USERS - 1)));
+    if (UserExistsIndex(current))
-    if (UserExistsIndex(current)) {
        current = 0;
-    }
    OpenUser(*GetUser(current));
 }
@@ -192,8 +189,8 @@ std::size_t ProfileManager::GetUserCount() const {
 /// booting
 std::size_t ProfileManager::GetOpenUserCount() const {
-    return static_cast<std::size_t>(std::count_if(profiles.begin(), profiles.end(),
+    return std::count_if(profiles.begin(), profiles.end(),
-                                                  [](const ProfileInfo& p) { return p.is_open; }));
+                         [](const ProfileInfo& p) { return p.is_open; });
 }
 /// Checks if a user id exists in our profile manager
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index 995b7e5c6..d7a81f64a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -1311,7 +1311,7 @@ void IApplicationFunctions::PopLaunchParameter(Kernel::HLERequestContext& ctx) {
        params.is_account_selected = 1;
        Account::ProfileManager profile_manager{};
-        const auto uuid = profile_manager.GetUser(static_cast<u32>(Settings::values.current_user));
+        const auto uuid = profile_manager.GetUser(Settings::values.current_user);
        ASSERT(uuid);
        params.current_user = uuid->uuid;
diff --git a/src/core/hle/service/am/applets/controller.cpp b/src/core/hle/service/am/applets/controller.cpp
index 17788d7a5..2151da783 100644
--- a/src/core/hle/service/am/applets/controller.cpp
+++ b/src/core/hle/service/am/applets/controller.cpp
@@ -178,23 +178,23 @@ void Controller::Execute() {
 }
 void Controller::ConfigurationComplete() {
-    const auto& players = Settings::values.players;
+    ControllerSupportResultInfo result_info{};
-    const s8 player_count =
-        is_single_mode
-            ? 1
-            : static_cast<s8>(std::count_if(players.begin(), players.end() - 2,
-                                            [](const auto& player) { return player.connected; }));
-    const auto index = static_cast<u32>(std::distance(
+    const auto& players = Settings::values.players;
-        players.begin(), std::find_if(players.begin(), players.end(),
-                                      [](const auto& player) { return player.connected; })));
    // If enable_single_mode is enabled, player_count is 1 regardless of any other parameters.
    // Otherwise, only count connected players from P1-P8.
-    ControllerSupportResultInfo result_info{};
+    result_info.player_count =
-    result_info.player_count = player_count;
+        is_single_mode ? 1
-    result_info.selected_id = HID::Controller_NPad::IndexToNPad(index);
+                       : static_cast<s8>(std::count_if(
+                             players.begin(), players.end() - 2,
+                             [](Settings::PlayerInput player) { return player.connected; }));
+    result_info.selected_id = HID::Controller_NPad::IndexToNPad(
+        std::distance(players.begin(),
+                      std::find_if(players.begin(), players.end(),
+                                   [](Settings::PlayerInput player) { return player.connected; })));
    result_info.result = 0;
    LOG_DEBUG(Service_HID, "Result Info: player_count={}, selected_id={}, result={}",
diff --git a/src/core/hle/service/audio/audout_u.cpp b/src/core/hle/service/audio/audout_u.cpp
index a345a68e6..9b4910e53 100644
--- a/src/core/hle/service/audio/audout_u.cpp
+++ b/src/core/hle/service/audio/audout_u.cpp
@@ -69,10 +69,9 @@ public:
        buffer_event =
            Kernel::WritableEvent::CreateEventPair(system.Kernel(), "IAudioOutBufferReleased");
-        stream =
+        stream = audio_core.OpenStream(system.CoreTiming(), audio_params.sample_rate,
-            audio_core.OpenStream(system.CoreTiming(), static_cast<u32>(audio_params.sample_rate),
+                                       audio_params.channel_count, std::move(unique_name),
-                                  audio_params.channel_count, std::move(unique_name),
+                                       [this] { buffer_event.writable->Signal(); });
-                                  [this] { buffer_event.writable->Signal(); });
    }
 private:
diff --git a/src/core/hle/service/audio/hwopus.cpp b/src/core/hle/service/audio/hwopus.cpp
index 16a6deb7e..f1d81602c 100644
--- a/src/core/hle/service/audio/hwopus.cpp
+++ b/src/core/hle/service/audio/hwopus.cpp
@@ -50,8 +50,8 @@ public:
        Enabled,
    };
-    explicit OpusDecoderState(OpusDecoderPtr decoder_, s32 sample_rate_, u32 channel_count_)
+    explicit OpusDecoderState(OpusDecoderPtr decoder, u32 sample_rate, u32 channel_count)
-        : decoder{std::move(decoder_)}, sample_rate{sample_rate_}, channel_count{channel_count_} {}
+        : decoder{std::move(decoder)}, sample_rate{sample_rate}, channel_count{channel_count} {}
    // Decodes interleaved Opus packets. Optionally allows reporting time taken to
    // perform the decoding, as well as any relevant extra behavior.
@@ -113,16 +113,15 @@ private:
            return false;
        }
-        const auto* const frame = input.data() + sizeof(OpusPacketHeader);
+        const auto frame = input.data() + sizeof(OpusPacketHeader);
        const auto decoded_sample_count = opus_packet_get_nb_samples(
-            frame, static_cast<opus_int32>(input.size() - sizeof(OpusPacketHeader)), sample_rate);
+            frame, static_cast<opus_int32>(input.size() - sizeof(OpusPacketHeader)),
-        const auto decoded_size =
+            static_cast<opus_int32>(sample_rate));
-            static_cast<u32>(decoded_sample_count) * channel_count * sizeof(u16);
+        if (decoded_sample_count * channel_count * sizeof(u16) > raw_output_sz) {
-        if (decoded_size > raw_output_sz) {
            LOG_ERROR(
                Audio,
                "Decoded data does not fit into the output data, decoded_sz={}, raw_output_sz={}",
-                decoded_size, raw_output_sz);
+                decoded_sample_count * channel_count * sizeof(u16), raw_output_sz);
            return false;
        }
@@ -138,11 +137,11 @@ private:
        }
        const auto end_time = std::chrono::high_resolution_clock::now() - start_time;
-        sample_count = static_cast<u32>(out_sample_count);
+        sample_count = out_sample_count;
        consumed = static_cast<u32>(sizeof(OpusPacketHeader) + hdr.size);
        if (out_performance_time != nullptr) {
-            *out_performance_time = static_cast<u64>(
+            *out_performance_time =
-                std::chrono::duration_cast<std::chrono::milliseconds>(end_time).count());
+                std::chrono::duration_cast<std::chrono::milliseconds>(end_time).count();
        }
        return true;
@@ -155,7 +154,7 @@ private:
    }
    OpusDecoderPtr decoder;
-    s32 sample_rate;
+    u32 sample_rate;
    u32 channel_count;
 };
@@ -213,7 +212,7 @@ std::size_t WorkerBufferSize(u32 channel_count) {
    ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
    constexpr int num_streams = 1;
    const int num_stereo_streams = channel_count == 2 ? 1 : 0;
-    return static_cast<size_t>(opus_multistream_decoder_get_size(num_streams, num_stereo_streams));
+    return opus_multistream_decoder_get_size(num_streams, num_stereo_streams);
 }
 // Creates the mapping table that maps the input channels to the particular
@@ -245,7 +244,7 @@ void HwOpus::GetWorkBufferSize(Kernel::HLERequestContext& ctx) {
               "Invalid sample rate");
    ASSERT_MSG(channel_count == 1 || channel_count == 2, "Invalid channel count");
-    const auto worker_buffer_sz = static_cast<u32>(WorkerBufferSize(channel_count));
+    const u32 worker_buffer_sz = static_cast<u32>(WorkerBufferSize(channel_count));
    LOG_DEBUG(Audio, "worker_buffer_sz={}", worker_buffer_sz);
    IPC::ResponseBuilder rb{ctx, 3};
@@ -255,7 +254,7 @@ void HwOpus::GetWorkBufferSize(Kernel::HLERequestContext& ctx) {
 void HwOpus::OpenOpusDecoder(Kernel::HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
-    const auto sample_rate = rp.Pop<s32>();
+    const auto sample_rate = rp.Pop<u32>();
    const auto channel_count = rp.Pop<u32>();
    const auto buffer_sz = rp.Pop<u32>();
diff --git a/src/core/hle/service/bcat/backend/backend.h b/src/core/hle/service/bcat/backend/backend.h
index 1e5e93290..48bbbe66f 100644
--- a/src/core/hle/service/bcat/backend/backend.h
+++ b/src/core/hle/service/bcat/backend/backend.h
@@ -53,10 +53,10 @@ struct DeliveryCacheProgressImpl {
    ResultCode result = RESULT_SUCCESS;
    DirectoryName current_directory;
    FileName current_file;
-    u64 current_downloaded_bytes; ///< Bytes downloaded on current file.
+    s64 current_downloaded_bytes; ///< Bytes downloaded on current file.
-    u64 current_total_bytes;      ///< Bytes total on current file.
+    s64 current_total_bytes;      ///< Bytes total on current file.
-    u64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
+    s64 total_downloaded_bytes;   ///< Bytes downloaded on overall download.
-    u64 total_bytes;              ///< Bytes total on overall download.
+    s64 total_bytes;              ///< Bytes total on overall download.
    INSERT_PADDING_BYTES(
        0x198); ///< Appears to be unused in official code, possibly reserved for future use.
 };
diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp
index e6cadf491..3b6f7498e 100644
--- a/src/core/hle/service/bcat/backend/boxcat.cpp
+++ b/src/core/hle/service/bcat/backend/boxcat.cpp
@@ -3,16 +3,7 @@
 // Refer to the license.txt file included.
 #include <fmt/ostream.h>
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-conversion"
-#endif
 #include <httplib.h>
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
 #include <mbedtls/sha256.h>
 #include <nlohmann/json.hpp>
 #include "common/hex_util.h"
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp
index 5a7e9f930..db0e06ca1 100644
--- a/src/core/hle/service/bcat/module.cpp
+++ b/src/core/hle/service/bcat/module.cpp
@@ -454,8 +454,7 @@ private:
        write_size = std::min<u64>(write_size, files.size());
        std::vector<DeliveryCacheDirectoryEntry> entries(write_size);
        std::transform(
-            files.begin(), files.begin() + static_cast<s64>(write_size), entries.begin(),
+            files.begin(), files.begin() + write_size, entries.begin(), [](const auto& file) {
-            [](const auto& file) {
                FileName name{};
                std::memcpy(name.data(), file->GetName().data(),
                            std::min(file->GetName().size(), name.size()));
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp
index 993686f1d..649128be4 100644
--- a/src/core/hle/service/filesystem/fsp_srv.cpp
+++ b/src/core/hle/service/filesystem/fsp_srv.cpp
@@ -94,8 +94,7 @@ private:
        }
        // Read the data from the Storage backend
-        const auto output = backend->ReadBytes(static_cast<u64>(length), static_cast<u64>(offset));
+        std::vector<u8> output = backend->ReadBytes(length, offset);
        // Write the data to memory
        ctx.WriteBuffer(output);
@@ -152,7 +151,7 @@ private:
        }
        // Read the data from the Storage backend
-        const auto output = backend->ReadBytes(static_cast<u64>(length), static_cast<u64>(offset));
+        std::vector<u8> output = backend->ReadBytes(length, offset);
        // Write the data to memory
        ctx.WriteBuffer(output);
@@ -195,8 +194,7 @@ private:
        // Write the data to the Storage backend
        const auto write_size =
            static_cast<std::size_t>(std::distance(data.begin(), data.begin() + length));
-        const std::size_t written =
+        const std::size_t written = backend->Write(data.data(), write_size, offset);
-            backend->Write(data.data(), write_size, static_cast<u64>(offset));
        ASSERT_MSG(static_cast<s64>(written) == length,
                   "Could not write all bytes to file (requested={:016X}, actual={:016X}).", length,
diff --git a/src/core/hle/service/hid/controllers/debug_pad.cpp b/src/core/hle/service/hid/controllers/debug_pad.cpp
index c2c1470a5..ad251ed4a 100644
--- a/src/core/hle/service/hid/controllers/debug_pad.cpp
+++ b/src/core/hle/service/hid/controllers/debug_pad.cpp
@@ -23,7 +23,7 @@ void Controller_DebugPad::OnRelease() {}
 void Controller_DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                                   std::size_t size) {
-    shared_memory.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+    shared_memory.header.timestamp = core_timing.GetCPUTicks();
    shared_memory.header.total_entry_count = 17;
    if (!IsControllerActivated()) {
@@ -33,11 +33,9 @@ void Controller_DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing,
    }
    shared_memory.header.entry_count = 16;
-    const auto& last_entry =
+    const auto& last_entry = shared_memory.pad_states[shared_memory.header.last_entry_index];
-        shared_memory.pad_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    shared_memory.header.last_entry_index = (shared_memory.header.last_entry_index + 1) % 17;
-    auto& cur_entry =
+    auto& cur_entry = shared_memory.pad_states[shared_memory.header.last_entry_index];
-        shared_memory.pad_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    cur_entry.sampling_number = last_entry.sampling_number + 1;
    cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/hid/controllers/gesture.cpp b/src/core/hle/service/hid/controllers/gesture.cpp
index 0618b2a05..b7b7bfeae 100644
--- a/src/core/hle/service/hid/controllers/gesture.cpp
+++ b/src/core/hle/service/hid/controllers/gesture.cpp
@@ -19,7 +19,7 @@ void Controller_Gesture::OnRelease() {}
 void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                                  std::size_t size) {
-    shared_memory.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+    shared_memory.header.timestamp = core_timing.GetCPUTicks();
    shared_memory.header.total_entry_count = 17;
    if (!IsControllerActivated()) {
@@ -29,11 +29,9 @@ void Controller_Gesture::OnUpdate(const Core::Timing::CoreTiming& core_timing, u
    }
    shared_memory.header.entry_count = 16;
-    const auto& last_entry =
+    const auto& last_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
-        shared_memory.gesture_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    shared_memory.header.last_entry_index = (shared_memory.header.last_entry_index + 1) % 17;
-    auto& cur_entry =
+    auto& cur_entry = shared_memory.gesture_states[shared_memory.header.last_entry_index];
-        shared_memory.gesture_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    cur_entry.sampling_number = last_entry.sampling_number + 1;
    cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/hid/controllers/keyboard.cpp b/src/core/hle/service/hid/controllers/keyboard.cpp
index 0624be316..59b694cd4 100644
--- a/src/core/hle/service/hid/controllers/keyboard.cpp
+++ b/src/core/hle/service/hid/controllers/keyboard.cpp
@@ -21,7 +21,7 @@ void Controller_Keyboard::OnRelease() {}
 void Controller_Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                                   std::size_t size) {
-    shared_memory.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+    shared_memory.header.timestamp = core_timing.GetCPUTicks();
    shared_memory.header.total_entry_count = 17;
    if (!IsControllerActivated()) {
@@ -31,11 +31,9 @@ void Controller_Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing,
    }
    shared_memory.header.entry_count = 16;
-    const auto& last_entry =
+    const auto& last_entry = shared_memory.pad_states[shared_memory.header.last_entry_index];
-        shared_memory.pad_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    shared_memory.header.last_entry_index = (shared_memory.header.last_entry_index + 1) % 17;
-    auto& cur_entry =
+    auto& cur_entry = shared_memory.pad_states[shared_memory.header.last_entry_index];
-        shared_memory.pad_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    cur_entry.sampling_number = last_entry.sampling_number + 1;
    cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/hid/controllers/mouse.cpp b/src/core/hle/service/hid/controllers/mouse.cpp
index 10e2373bc..ac40989c5 100644
--- a/src/core/hle/service/hid/controllers/mouse.cpp
+++ b/src/core/hle/service/hid/controllers/mouse.cpp
@@ -19,7 +19,7 @@ void Controller_Mouse::OnRelease() {}
 void Controller_Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                                std::size_t size) {
-    shared_memory.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+    shared_memory.header.timestamp = core_timing.GetCPUTicks();
    shared_memory.header.total_entry_count = 17;
    if (!IsControllerActivated()) {
@@ -29,11 +29,9 @@ void Controller_Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
    }
    shared_memory.header.entry_count = 16;
-    auto& last_entry =
+    auto& last_entry = shared_memory.mouse_states[shared_memory.header.last_entry_index];
-        shared_memory.mouse_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    shared_memory.header.last_entry_index = (shared_memory.header.last_entry_index + 1) % 17;
-    auto& cur_entry =
+    auto& cur_entry = shared_memory.mouse_states[shared_memory.header.last_entry_index];
-        shared_memory.mouse_states[static_cast<u64>(shared_memory.header.last_entry_index)];
    cur_entry.sampling_number = last_entry.sampling_number + 1;
    cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 2422c0190..e311bc18c 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -341,29 +341,26 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
    }
    for (std::size_t i = 0; i < shared_memory_entries.size(); i++) {
        auto& npad = shared_memory_entries[i];
-        const std::array controller_npads{
+        const std::array<NPadGeneric*, 7> controller_npads{&npad.main_controller_states,
-            &npad.main_controller_states,
+                                                           &npad.handheld_states,
-            &npad.handheld_states,
+                                                           &npad.dual_states,
-            &npad.dual_states,
+                                                           &npad.left_joy_states,
-            &npad.left_joy_states,
+                                                           &npad.right_joy_states,
-            &npad.right_joy_states,
+                                                           &npad.pokeball_states,
-            &npad.pokeball_states,
+                                                           &npad.libnx};
-            &npad.libnx,
-        };
        for (auto* main_controller : controller_npads) {
            main_controller->common.entry_count = 16;
            main_controller->common.total_entry_count = 17;
            const auto& last_entry =
-                main_controller->npad[static_cast<u64>(main_controller->common.last_entry_index)];
+                main_controller->npad[main_controller->common.last_entry_index];
-            main_controller->common.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+            main_controller->common.timestamp = core_timing.GetCPUTicks();
            main_controller->common.last_entry_index =
                (main_controller->common.last_entry_index + 1) % 17;
-            auto& cur_entry =
+            auto& cur_entry = main_controller->npad[main_controller->common.last_entry_index];
-                main_controller->npad[static_cast<u64>(main_controller->common.last_entry_index)];
            cur_entry.timestamp = last_entry.timestamp + 1;
            cur_entry.timestamp2 = cur_entry.timestamp;
@@ -374,29 +371,22 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
        if (controller_type == NPadControllerType::None || !connected_controllers[i].is_connected) {
            continue;
        }
-        const auto npad_index = static_cast<u32>(i);
+        const u32 npad_index = static_cast<u32>(i);
        RequestPadStateUpdate(npad_index);
        auto& pad_state = npad_pad_states[npad_index];
        auto& main_controller =
-            npad.main_controller_states
+            npad.main_controller_states.npad[npad.main_controller_states.common.last_entry_index];
-                .npad[static_cast<u64>(npad.main_controller_states.common.last_entry_index)];
        auto& handheld_entry =
-            npad.handheld_states
+            npad.handheld_states.npad[npad.handheld_states.common.last_entry_index];
-                .npad[static_cast<u64>(npad.handheld_states.common.last_entry_index)];
+        auto& dual_entry = npad.dual_states.npad[npad.dual_states.common.last_entry_index];
-        auto& dual_entry =
+        auto& left_entry = npad.left_joy_states.npad[npad.left_joy_states.common.last_entry_index];
-            npad.dual_states.npad[static_cast<u64>(npad.dual_states.common.last_entry_index)];
-        auto& left_entry =
-            npad.left_joy_states
-                .npad[static_cast<u64>(npad.left_joy_states.common.last_entry_index)];
        auto& right_entry =
-            npad.right_joy_states
+            npad.right_joy_states.npad[npad.right_joy_states.common.last_entry_index];
-                .npad[static_cast<u64>(npad.right_joy_states.common.last_entry_index)];
        auto& pokeball_entry =
-            npad.pokeball_states
+            npad.pokeball_states.npad[npad.pokeball_states.common.last_entry_index];
-                .npad[static_cast<u64>(npad.pokeball_states.common.last_entry_index)];
+        auto& libnx_entry = npad.libnx.npad[npad.libnx.common.last_entry_index];
-        auto& libnx_entry = npad.libnx.npad[static_cast<u64>(npad.libnx.common.last_entry_index)];
        libnx_entry.connection_status.raw = 0;
        libnx_entry.connection_status.IsConnected.Assign(1);
@@ -510,14 +500,13 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
            sixaxis_sensor->common.total_entry_count = 17;
            const auto& last_entry =
-                sixaxis_sensor->sixaxis[static_cast<u64>(sixaxis_sensor->common.last_entry_index)];
+                sixaxis_sensor->sixaxis[sixaxis_sensor->common.last_entry_index];
-            sixaxis_sensor->common.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+            sixaxis_sensor->common.timestamp = core_timing.GetCPUTicks();
            sixaxis_sensor->common.last_entry_index =
                (sixaxis_sensor->common.last_entry_index + 1) % 17;
-            auto& cur_entry =
+            auto& cur_entry = sixaxis_sensor->sixaxis[sixaxis_sensor->common.last_entry_index];
-                sixaxis_sensor->sixaxis[static_cast<u64>(sixaxis_sensor->common.last_entry_index)];
            cur_entry.timestamp = last_entry.timestamp + 1;
            cur_entry.timestamp2 = cur_entry.timestamp;
@@ -540,21 +529,17 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing
        }
        auto& full_sixaxis_entry =
-            npad.sixaxis_full.sixaxis[static_cast<u64>(npad.sixaxis_full.common.last_entry_index)];
+            npad.sixaxis_full.sixaxis[npad.sixaxis_full.common.last_entry_index];
        auto& handheld_sixaxis_entry =
-            npad.sixaxis_handheld
+            npad.sixaxis_handheld.sixaxis[npad.sixaxis_handheld.common.last_entry_index];
-                .sixaxis[static_cast<u64>(npad.sixaxis_handheld.common.last_entry_index)];
        auto& dual_left_sixaxis_entry =
-            npad.sixaxis_dual_left
+            npad.sixaxis_dual_left.sixaxis[npad.sixaxis_dual_left.common.last_entry_index];
-                .sixaxis[static_cast<u64>(npad.sixaxis_dual_left.common.last_entry_index)];
        auto& dual_right_sixaxis_entry =
-            npad.sixaxis_dual_right
+            npad.sixaxis_dual_right.sixaxis[npad.sixaxis_dual_right.common.last_entry_index];
-                .sixaxis[static_cast<u64>(npad.sixaxis_dual_right.common.last_entry_index)];
        auto& left_sixaxis_entry =
-            npad.sixaxis_left.sixaxis[static_cast<u64>(npad.sixaxis_left.common.last_entry_index)];
+            npad.sixaxis_left.sixaxis[npad.sixaxis_left.common.last_entry_index];
        auto& right_sixaxis_entry =
-            npad.sixaxis_right
+            npad.sixaxis_right.sixaxis[npad.sixaxis_right.common.last_entry_index];
-                .sixaxis[static_cast<u64>(npad.sixaxis_right.common.last_entry_index)];
        switch (controller_type) {
        case NPadControllerType::None:
diff --git a/src/core/hle/service/hid/controllers/stubbed.cpp b/src/core/hle/service/hid/controllers/stubbed.cpp
index f9cb61667..e7483bfa2 100644
--- a/src/core/hle/service/hid/controllers/stubbed.cpp
+++ b/src/core/hle/service/hid/controllers/stubbed.cpp
@@ -22,12 +22,12 @@ void Controller_Stubbed::OnUpdate(const Core::Timing::CoreTiming& core_timing, u
        return;
    }
-    const CommonHeader header{
+    CommonHeader header{};
-        .timestamp = static_cast<s64>(core_timing.GetCPUTicks()),
+    header.timestamp = core_timing.GetCPUTicks();
-        .total_entry_count = 17,
+    header.total_entry_count = 17;
-        .last_entry_index = 0,
+    header.entry_count = 0;
-        .entry_count = 0,
+    header.last_entry_index = 0;
-    };
    std::memcpy(data + common_offset, &header, sizeof(CommonHeader));
 }
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index 06f4134a2..0df395e85 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -22,7 +22,7 @@ void Controller_Touchscreen::OnRelease() {}
 void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                                      std::size_t size) {
-    shared_memory.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+    shared_memory.header.timestamp = core_timing.GetCPUTicks();
    shared_memory.header.total_entry_count = 17;
    if (!IsControllerActivated()) {
@@ -33,12 +33,9 @@ void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timin
    shared_memory.header.entry_count = 16;
    const auto& last_entry =
-        shared_memory
+        shared_memory.shared_memory_entries[shared_memory.header.last_entry_index];
-            .shared_memory_entries[static_cast<u64>(shared_memory.header.last_entry_index)];
    shared_memory.header.last_entry_index = (shared_memory.header.last_entry_index + 1) % 17;
-    auto& cur_entry =
+    auto& cur_entry = shared_memory.shared_memory_entries[shared_memory.header.last_entry_index];
-        shared_memory
-            .shared_memory_entries[static_cast<u64>(shared_memory.header.last_entry_index)];
    cur_entry.sampling_number = last_entry.sampling_number + 1;
    cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/hid/controllers/touchscreen.h b/src/core/hle/service/hid/controllers/touchscreen.h
index 746acbd1c..4d9042adc 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.h
+++ b/src/core/hle/service/hid/controllers/touchscreen.h
@@ -69,6 +69,6 @@ private:
    TouchScreenSharedMemory shared_memory{};
    std::unique_ptr<Input::TouchDevice> touch_device;
    std::unique_ptr<Input::TouchDevice> touch_btn_device;
-    u64_le last_touch{};
+    s64_le last_touch{};
 };
 } // namespace Service::HID
diff --git a/src/core/hle/service/hid/controllers/xpad.cpp b/src/core/hle/service/hid/controllers/xpad.cpp
index 60417abb8..2503ef241 100644
--- a/src/core/hle/service/hid/controllers/xpad.cpp
+++ b/src/core/hle/service/hid/controllers/xpad.cpp
@@ -20,7 +20,7 @@ void Controller_XPad::OnRelease() {}
 void Controller_XPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data,
                               std::size_t size) {
    for (auto& xpad_entry : shared_memory.shared_memory_entries) {
-        xpad_entry.header.timestamp = static_cast<s64>(core_timing.GetCPUTicks());
+        xpad_entry.header.timestamp = core_timing.GetCPUTicks();
        xpad_entry.header.total_entry_count = 17;
        if (!IsControllerActivated()) {
@@ -30,11 +30,9 @@ void Controller_XPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
        }
        xpad_entry.header.entry_count = 16;
-        const auto& last_entry =
+        const auto& last_entry = xpad_entry.pad_states[xpad_entry.header.last_entry_index];
-            xpad_entry.pad_states[static_cast<u64>(xpad_entry.header.last_entry_index)];
        xpad_entry.header.last_entry_index = (xpad_entry.header.last_entry_index + 1) % 17;
-        auto& cur_entry =
+        auto& cur_entry = xpad_entry.pad_states[xpad_entry.header.last_entry_index];
-            xpad_entry.pad_states[static_cast<u64>(xpad_entry.header.last_entry_index)];
        cur_entry.sampling_number = last_entry.sampling_number + 1;
        cur_entry.sampling_number2 = cur_entry.sampling_number;
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index 9ad5bbf0d..d8cd10e31 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -23,7 +23,7 @@ namespace Service::LDR {
 constexpr ResultCode ERROR_INSUFFICIENT_ADDRESS_SPACE{ErrorModule::RO, 2};
-[[maybe_unused]] constexpr ResultCode ERROR_INVALID_MEMORY_STATE{ErrorModule::Loader, 51};
+constexpr ResultCode ERROR_INVALID_MEMORY_STATE{ErrorModule::Loader, 51};
 constexpr ResultCode ERROR_INVALID_NRO{ErrorModule::Loader, 52};
 constexpr ResultCode ERROR_INVALID_NRR{ErrorModule::Loader, 53};
 constexpr ResultCode ERROR_MISSING_NRR_HASH{ErrorModule::Loader, 54};
@@ -33,7 +33,7 @@ constexpr ResultCode ERROR_ALREADY_LOADED{ErrorModule::Loader, 57};
 constexpr ResultCode ERROR_INVALID_ALIGNMENT{ErrorModule::Loader, 81};
 constexpr ResultCode ERROR_INVALID_SIZE{ErrorModule::Loader, 82};
 constexpr ResultCode ERROR_INVALID_NRO_ADDRESS{ErrorModule::Loader, 84};
-[[maybe_unused]] constexpr ResultCode ERROR_INVALID_NRR_ADDRESS{ErrorModule::Loader, 85};
+constexpr ResultCode ERROR_INVALID_NRR_ADDRESS{ErrorModule::Loader, 85};
 constexpr ResultCode ERROR_NOT_INITIALIZED{ErrorModule::Loader, 87};
 constexpr std::size_t MAXIMUM_LOADED_RO{0x40};
diff --git a/src/core/hle/service/mii/manager.cpp b/src/core/hle/service/mii/manager.cpp
index 1b75c2ebe..d73b90015 100644
--- a/src/core/hle/service/mii/manager.cpp
+++ b/src/core/hle/service/mii/manager.cpp
@@ -240,10 +240,10 @@ MiiStoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Commo
    bf.eye_type.Assign(
        eye_type_info.values[GetRandomValue<std::size_t>(eye_type_info.values_count)]);
-    const auto eye_rotate_1{gender != Gender::Male ? 4U : 2U};
+    const auto eye_rotate_1{gender != Gender::Male ? 4 : 2};
-    const auto eye_rotate_2{gender != Gender::Male ? 3U : 4U};
+    const auto eye_rotate_2{gender != Gender::Male ? 3 : 4};
-    const auto eye_rotate_offset{32U - EyeRotateLookup[eye_rotate_1] + eye_rotate_2};
+    const auto eye_rotate_offset{32 - EyeRotateLookup[eye_rotate_1] + eye_rotate_2};
-    const auto eye_rotate{32U - EyeRotateLookup[bf.eye_type]};
+    const auto eye_rotate{32 - EyeRotateLookup[bf.eye_type]};
    bf.eye_color.Assign(
        EyeColorLookup[eye_color_info
@@ -257,11 +257,11 @@ MiiStoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Commo
    bf.eyebrow_type.Assign(
        eyebrow_type_info.values[GetRandomValue<std::size_t>(eyebrow_type_info.values_count)]);
-    const auto eyebrow_rotate_1{race == Race::Asian ? 6U : 0U};
+    const auto eyebrow_rotate_1{race == Race::Asian ? 6 : 0};
-    const auto eyebrow_y{race == Race::Asian ? 9U : 10U};
+    const auto eyebrow_y{race == Race::Asian ? 9 : 10};
-    const auto eyebrow_rotate_offset{32U - EyebrowRotateLookup[eyebrow_rotate_1] + 6};
+    const auto eyebrow_rotate_offset{32 - EyebrowRotateLookup[eyebrow_rotate_1] + 6};
    const auto eyebrow_rotate{
-        32U - EyebrowRotateLookup[static_cast<std::size_t>(bf.eyebrow_type.Value())]};
+        32 - EyebrowRotateLookup[static_cast<std::size_t>(bf.eyebrow_type.Value())]};
    bf.eyebrow_color.Assign(bf.hair_color);
    bf.eyebrow_scale.Assign(4);
@@ -270,14 +270,14 @@ MiiStoreData BuildRandomStoreData(Age age, Gender gender, Race race, const Commo
    bf.eyebrow_x.Assign(2);
    bf.eyebrow_y.Assign(axis_y + eyebrow_y);
-    const auto nose_scale{gender == Gender::Female ? 3U : 4U};
+    const auto nose_scale{gender == Gender::Female ? 3 : 4};
    bf.nose_type.Assign(
        nose_type_info.values[GetRandomValue<std::size_t>(nose_type_info.values_count)]);
    bf.nose_scale.Assign(nose_scale);
    bf.nose_y.Assign(axis_y + 9);
-    const auto mouth_color{gender == Gender::Female ? GetRandomValue<u32>(4) : 0U};
+    const auto mouth_color{gender == Gender::Female ? GetRandomValue<int>(4) : 0};
    bf.mouth_type.Assign(
        mouth_type_info.values[GetRandomValue<std::size_t>(mouth_type_info.values_count)]);
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index 0dd23ec9e..a0469ffbd 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -217,7 +217,7 @@ private:
        const auto& amiibo = nfp_interface.GetAmiiboBuffer();
        const TagInfo tag_info{
            .uuid = amiibo.uuid,
-            .uuid_length = static_cast<u8>(amiibo.uuid.size()),
+            .uuid_length = static_cast<u8>(tag_info.uuid.size()),
            .padding_1 = {},
            .protocol = 1, // TODO(ogniK): Figure out actual values
            .tag_type = 2,
diff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cpp
index 3edee6303..58ee1f712 100644
--- a/src/core/hle/service/ns/ns.cpp
+++ b/src/core/hle/service/ns/ns.cpp
@@ -368,7 +368,7 @@ ResultVal<u8> IApplicationManagerInterface::GetApplicationDesiredLanguage(
    // Get language code from settings
    const auto language_code =
-        Set::GetLanguageCodeFromIndex(static_cast<u32>(Settings::values.language_index.GetValue()));
+        Set::GetLanguageCodeFromIndex(Settings::values.language_index.GetValue());
    // Convert to application language, get priority list
    const auto application_language = ConvertToApplicationLanguage(language_code);
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index 5ccec2637..40838a225 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -50,9 +50,19 @@ constexpr std::array<std::pair<FontArchives, const char*>, 7> SHARED_FONTS{
    std::make_pair(FontArchives::Extension, "nintendo_ext2_003.bfttf"),
 };
+constexpr std::array<const char*, 7> SHARED_FONTS_TTF{
+    "FontStandard.ttf",
+    "FontChineseSimplified.ttf",
+    "FontExtendedChineseSimplified.ttf",
+    "FontChineseTraditional.ttf",
+    "FontKorean.ttf",
+    "FontNintendoExtended.ttf",
+    "FontNintendoExtended2.ttf",
+};
 // The below data is specific to shared font data dumped from Switch on f/w 2.2
 // Virtual address and offsets/sizes likely will vary by dump
-[[maybe_unused]] constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL};
+constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL};
 constexpr u32 EXPECTED_RESULT{0x7f9a0218}; // What we expect the decrypted bfttf first 4 bytes to be
 constexpr u32 EXPECTED_MAGIC{0x36f81a1e};  // What we expect the encrypted bfttf first 4 bytes to be
 constexpr u64 SHARED_FONT_MEM_SIZE{0x1100000};
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
index 3a5bebff3..f2529a12e 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp
@@ -155,7 +155,7 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
    const auto object{nvmap_dev->GetObject(params.nvmap_handle)};
    if (!object) {
-        LOG_ERROR(Service_NVDRV, "invalid nvmap_handle={:X}", params.nvmap_handle);
+        LOG_CRITICAL(Service_NVDRV, "invalid nvmap_handle={:X}", params.nvmap_handle);
        std::memcpy(output.data(), &params, output.size());
        return NvErrCodes::InvalidInput;
    }
@@ -167,24 +167,21 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
    auto& gpu = system.GPU();
    u64 page_size{params.page_size};
-    if (page_size == 0) {
+    if (!page_size) {
        page_size = object->align;
    }
    if ((params.flags & AddressSpaceFlags::Remap) != AddressSpaceFlags::None) {
-        const auto buffer_map = FindBufferMap(static_cast<GPUVAddr>(params.offset));
+        if (const auto buffer_map{FindBufferMap(params.offset)}; buffer_map) {
+            const auto cpu_addr{static_cast<VAddr>(buffer_map->CpuAddr() + params.buffer_offset)};
-        if (buffer_map) {
-            const auto cpu_addr{
-                static_cast<VAddr>(buffer_map->CpuAddr() + static_cast<u64>(params.buffer_offset))};
            const auto gpu_addr{static_cast<GPUVAddr>(params.offset + params.buffer_offset)};
            if (!gpu.MemoryManager().Map(cpu_addr, gpu_addr, params.mapping_size)) {
-                LOG_ERROR(Service_NVDRV,
+                LOG_CRITICAL(Service_NVDRV,
-                          "Remap failed, flags={:X}, nvmap_handle={:X}, buffer_offset={}, "
+                             "remap failed, flags={:X}, nvmap_handle={:X}, buffer_offset={}, "
-                          "mapping_size = {}, offset={}",
+                             "mapping_size = {}, offset={}",
-                          params.flags, params.nvmap_handle, params.buffer_offset,
+                             params.flags, params.nvmap_handle, params.buffer_offset,
-                          params.mapping_size, params.offset);
+                             params.mapping_size, params.offset);
                std::memcpy(output.data(), &params, output.size());
                return NvErrCodes::InvalidInput;
@@ -193,7 +190,7 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
            std::memcpy(output.data(), &params, output.size());
            return NvErrCodes::Success;
        } else {
-            LOG_ERROR(Service_NVDRV, "Address not mapped. offset={}", params.offset);
+            LOG_CRITICAL(Service_NVDRV, "address not mapped offset={}", params.offset);
            std::memcpy(output.data(), &params, output.size());
            return NvErrCodes::InvalidInput;
@@ -203,27 +200,25 @@ u32 nvhost_as_gpu::MapBufferEx(const std::vector<u8>& input, std::vector<u8>& ou
    // We can only map objects that have already been assigned a CPU address.
    ASSERT(object->status == nvmap::Object::Status::Allocated);
-    const auto physical_address{object->addr + static_cast<VAddr>(params.buffer_offset)};
+    const auto physical_address{object->addr + params.buffer_offset};
    u64 size{params.mapping_size};
-    if (size == 0) {
+    if (!size) {
        size = object->size;
    }
    const bool is_alloc{(params.flags & AddressSpaceFlags::FixedOffset) == AddressSpaceFlags::None};
    if (is_alloc) {
-        params.offset =
+        params.offset = gpu.MemoryManager().MapAllocate(physical_address, size, page_size);
-            static_cast<s64>(gpu.MemoryManager().MapAllocate(physical_address, size, page_size));
    } else {
-        params.offset = static_cast<s64>(
+        params.offset = gpu.MemoryManager().Map(physical_address, params.offset, size);
-            gpu.MemoryManager().Map(physical_address, static_cast<GPUVAddr>(params.offset), size));
    }
    auto result{NvErrCodes::Success};
-    if (params.offset == 0) {
+    if (!params.offset) {
-        LOG_ERROR(Service_NVDRV, "Failed to map size={}", size);
+        LOG_CRITICAL(Service_NVDRV, "failed to map size={}", size);
        result = NvErrCodes::InvalidInput;
    } else {
-        AddBufferMap(static_cast<GPUVAddr>(params.offset), size, physical_address, is_alloc);
+        AddBufferMap(params.offset, size, physical_address, is_alloc);
    }
    std::memcpy(output.data(), &params, output.size());
@@ -234,13 +229,12 @@ u32 nvhost_as_gpu::UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& ou
    IoctlUnmapBuffer params{};
    std::memcpy(&params, input.data(), input.size());
-    const auto offset = static_cast<GPUVAddr>(params.offset);
+    LOG_DEBUG(Service_NVDRV, "called, offset=0x{:X}", params.offset);
-    LOG_DEBUG(Service_NVDRV, "called, offset=0x{:X}", offset);
-    if (const auto size{RemoveBufferMap(offset)}; size) {
+    if (const auto size{RemoveBufferMap(params.offset)}; size) {
-        system.GPU().MemoryManager().Unmap(offset, *size);
+        system.GPU().MemoryManager().Unmap(params.offset, *size);
    } else {
-        LOG_ERROR(Service_NVDRV, "invalid offset=0x{:X}", offset);
+        LOG_ERROR(Service_NVDRV, "invalid offset=0x{:X}", params.offset);
    }
    std::memcpy(output.data(), &params, output.size());
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 07d851d0e..b27ee0502 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
@@ -63,7 +63,8 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
        return NvResult::BadParameter;
    }
-    const u32 event_id = params.value & 0x00FF;
+    u32 event_id = params.value & 0x00FF;
    if (event_id >= MaxNvEvents) {
        std::memcpy(output.data(), &params, sizeof(params));
        return NvResult::BadParameter;
@@ -77,17 +78,16 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
        event.writable->Signal();
        return NvResult::Success;
    }
    auto lock = gpu.LockSync();
    const u32 current_syncpoint_value = gpu.GetSyncpointValue(params.syncpt_id);
-    const s32 diff = static_cast<s32>(current_syncpoint_value - params.threshold);
+    const s32 diff = current_syncpoint_value - params.threshold;
    if (diff >= 0) {
        event.writable->Signal();
        params.value = current_syncpoint_value;
        std::memcpy(output.data(), &params, sizeof(params));
        return NvResult::Success;
    }
-    const u32 target_value = current_syncpoint_value - static_cast<u32>(diff);
+    const u32 target_value = current_syncpoint_value - diff;
    if (!is_async) {
        params.value = 0;
@@ -98,7 +98,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
        return NvResult::Timeout;
    }
-    const EventState status = events_interface.status[event_id];
+    EventState status = events_interface.status[event_id];
    if (event_id < MaxNvEvents || status == EventState::Free || status == EventState::Registered) {
        events_interface.SetEventStatus(event_id, EventState::Waiting);
        events_interface.assigned_syncpt[event_id] = params.syncpt_id;
@@ -114,7 +114,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
        if (!is_async && ctrl.fresh_call) {
            ctrl.must_delay = true;
            ctrl.timeout = params.timeout;
-            ctrl.event_id = static_cast<s32>(event_id);
+            ctrl.event_id = event_id;
            return NvResult::Timeout;
        }
        std::memcpy(output.data(), &params, sizeof(params));
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
index 5e51b37be..f1966ac0e 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
@@ -127,7 +127,7 @@ u32 nvhost_gpu::AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& ou
                params.unk3);
    auto& gpu = system.GPU();
-    params.fence_out.id = static_cast<s32>(assigned_syncpoints);
+    params.fence_out.id = assigned_syncpoints;
    params.fence_out.value = gpu.GetSyncpointValue(assigned_syncpoints);
    assigned_syncpoints++;
    std::memcpy(output.data(), &params, output.size());
@@ -166,8 +166,7 @@ u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& outp
    UNIMPLEMENTED_IF(params.flags.add_increment.Value() != 0);
    auto& gpu = system.GPU();
-    const u32 current_syncpoint_value =
+    u32 current_syncpoint_value = gpu.GetSyncpointValue(params.fence_out.id);
-        gpu.GetSyncpointValue(static_cast<u32>(params.fence_out.id));
    if (params.flags.increment.Value()) {
        params.fence_out.value += current_syncpoint_value;
    } else {
@@ -201,8 +200,7 @@ u32 nvhost_gpu::KickoffPB(const std::vector<u8>& input, std::vector<u8>& output,
    UNIMPLEMENTED_IF(params.flags.add_increment.Value() != 0);
    auto& gpu = system.GPU();
-    const u32 current_syncpoint_value =
+    u32 current_syncpoint_value = gpu.GetSyncpointValue(params.fence_out.id);
-        gpu.GetSyncpointValue(static_cast<u32>(params.fence_out.id));
    if (params.flags.increment.Value()) {
        params.fence_out.value += current_syncpoint_value;
    } else {
diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp
index 2f4f73487..88fbfa9b0 100644
--- a/src/core/hle/service/nvdrv/interface.cpp
+++ b/src/core/hle/service/nvdrv/interface.cpp
@@ -61,9 +61,9 @@ void NVDRV::IoctlBase(Kernel::HLERequestContext& ctx, IoctlVersion version) {
    if (ctrl.must_delay) {
        ctrl.fresh_call = false;
        ctx.SleepClientThread(
-            "NVServices::DelayedResponse", static_cast<u64>(ctrl.timeout),
+            "NVServices::DelayedResponse", ctrl.timeout,
-            [=, this](std::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext& ctx_,
+            [=, this](std::shared_ptr<Kernel::Thread> thread, Kernel::HLERequestContext& ctx_,
-                      Kernel::ThreadWakeupReason) {
+                      Kernel::ThreadWakeupReason reason) {
                IoctlCtrl ctrl2{ctrl};
                std::vector<u8> tmp_output = output;
                std::vector<u8> tmp_output2 = output2;
@@ -77,7 +77,7 @@ void NVDRV::IoctlBase(Kernel::HLERequestContext& ctx, IoctlVersion version) {
                rb.Push(RESULT_SUCCESS);
                rb.Push(ioctl_result);
            },
-            nvdrv->GetEventWriteable(static_cast<u32>(ctrl.event_id)));
+            nvdrv->GetEventWriteable(ctrl.event_id));
    } else {
        ctx.WriteBuffer(output);
        if (version == IoctlVersion::Version3) {
diff --git a/src/core/hle/service/nvflinger/nvflinger.cpp b/src/core/hle/service/nvflinger/nvflinger.cpp
index 621a429bc..c64673dba 100644
--- a/src/core/hle/service/nvflinger/nvflinger.cpp
+++ b/src/core/hle/service/nvflinger/nvflinger.cpp
@@ -247,7 +247,7 @@ void NVFlinger::Compose() {
        guard->unlock();
        for (u32 fence_id = 0; fence_id < multi_fence.num_fences; fence_id++) {
            const auto& fence = multi_fence.fences[fence_id];
-            gpu.WaitFence(static_cast<u32>(fence.id), fence.value);
+            gpu.WaitFence(fence.id, fence.value);
        }
        guard->lock();
diff --git a/src/core/hle/service/service.cpp b/src/core/hle/service/service.cpp
index bc7476a5b..ba9159ee0 100644
--- a/src/core/hle/service/service.cpp
+++ b/src/core/hle/service/service.cpp
@@ -80,10 +80,10 @@ namespace Service {
                                                       std::string_view port_name,
                                                       const u32* cmd_buff) {
    // Number of params == bits 0-5 + bits 6-11
-    const u32 num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
+    int num_params = (cmd_buff[0] & 0x3F) + ((cmd_buff[0] >> 6) & 0x3F);
    std::string function_string = fmt::format("function '{}': port={}", name, port_name);
-    for (u32 i = 1; i <= num_params; ++i) {
+    for (int i = 1; i <= num_params; ++i) {
        function_string += fmt::format(", cmd_buff[{}]=0x{:X}", i, cmd_buff[i]);
    }
    return function_string;
diff --git a/src/core/hle/service/set/set.cpp b/src/core/hle/service/set/set.cpp
index 82a7aecc7..e64777668 100644
--- a/src/core/hle/service/set/set.cpp
+++ b/src/core/hle/service/set/set.cpp
@@ -91,8 +91,7 @@ void GetAvailableLanguageCodesImpl(Kernel::HLERequestContext& ctx, std::size_t m
 }
 void GetKeyCodeMapImpl(Kernel::HLERequestContext& ctx) {
-    const auto language_code =
+    const auto language_code = available_language_codes[Settings::values.language_index.GetValue()];
-        available_language_codes[static_cast<u32>(Settings::values.language_index.GetValue())];
    const auto key_code =
        std::find_if(language_to_layout.cbegin(), language_to_layout.cend(),
                     [=](const auto& element) { return element.first == language_code; });
@@ -168,8 +167,7 @@ void SET::GetLanguageCode(Kernel::HLERequestContext& ctx) {
    IPC::ResponseBuilder rb{ctx, 4};
    rb.Push(RESULT_SUCCESS);
-    rb.PushEnum(
+    rb.PushEnum(available_language_codes[Settings::values.language_index.GetValue()]);
-        available_language_codes[static_cast<u32>(Settings::values.language_index.GetValue())]);
 }
 void SET::GetRegionCode(Kernel::HLERequestContext& ctx) {
diff --git a/src/core/hle/service/sockets/bsd.cpp b/src/core/hle/service/sockets/bsd.cpp
index 7cb70064c..a74be9370 100644
--- a/src/core/hle/service/sockets/bsd.cpp
+++ b/src/core/hle/service/sockets/bsd.cpp
@@ -437,9 +437,9 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protoco
        UNIMPLEMENTED_MSG("SOCK_RAW errno management");
    }
-    [[maybe_unused]] const bool unk_flag = (static_cast<u32>(type) & 0x20000000U) != 0;
+    [[maybe_unused]] const bool unk_flag = (static_cast<u32>(type) & 0x20000000) != 0;
    UNIMPLEMENTED_IF_MSG(unk_flag, "Unknown flag in type");
-    type = static_cast<Type>(static_cast<u32>(type) & ~0x20000000U);
+    type = static_cast<Type>(static_cast<u32>(type) & ~0x20000000);
    const s32 fd = FindFreeFileDescriptorHandle();
    if (fd < 0) {
@@ -447,7 +447,7 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protoco
        return {-1, Errno::MFILE};
    }
-    FileDescriptor& descriptor = GetFileDescriptor(fd).emplace();
+    FileDescriptor& descriptor = file_descriptors[fd].emplace();
    // ENONMEM might be thrown here
    LOG_INFO(Service, "New socket fd={}", fd);
@@ -461,7 +461,7 @@ std::pair<s32, Errno> BSD::SocketImpl(Domain domain, Type type, Protocol protoco
 std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u8> read_buffer,
                                    s32 nfds, s32 timeout) {
-    if (write_buffer.size() < static_cast<size_t>(nfds) * sizeof(PollFD)) {
+    if (write_buffer.size() < nfds * sizeof(PollFD)) {
        return {-1, Errno::INVAL};
    }
@@ -471,7 +471,7 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u
    }
    const size_t length = std::min(read_buffer.size(), write_buffer.size());
-    std::vector<PollFD> fds(static_cast<size_t>(nfds));
+    std::vector<PollFD> fds(nfds);
    std::memcpy(fds.data(), read_buffer.data(), length);
    if (timeout >= 0) {
@@ -497,7 +497,7 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u
            return {0, Errno::SUCCESS};
        }
-        const std::optional<FileDescriptor>& descriptor = GetFileDescriptor(pollfd.fd);
+        const std::optional<FileDescriptor>& descriptor = file_descriptors[pollfd.fd];
        if (!descriptor) {
            LOG_ERROR(Service, "File descriptor handle={} is not allocated", pollfd.fd);
            pollfd.revents = POLL_NVAL;
@@ -508,7 +508,7 @@ std::pair<s32, Errno> BSD::PollImpl(std::vector<u8>& write_buffer, std::vector<u
    std::vector<Network::PollFD> host_pollfds(fds.size());
    std::transform(fds.begin(), fds.end(), host_pollfds.begin(), [this](PollFD pollfd) {
        Network::PollFD result;
-        result.socket = GetFileDescriptor(pollfd.fd)->socket.get();
+        result.socket = file_descriptors[pollfd.fd]->socket.get();
        result.events = TranslatePollEventsToHost(pollfd.events);
        result.revents = 0;
        return result;
@@ -536,13 +536,13 @@ std::pair<s32, Errno> BSD::AcceptImpl(s32 fd, std::vector<u8>& write_buffer) {
        return {-1, Errno::MFILE};
    }
-    FileDescriptor& descriptor = *GetFileDescriptor(fd);
+    FileDescriptor& descriptor = *file_descriptors[fd];
    auto [result, bsd_errno] = descriptor.socket->Accept();
    if (bsd_errno != Network::Errno::SUCCESS) {
        return {-1, Translate(bsd_errno)};
    }
-    FileDescriptor& new_descriptor = GetFileDescriptor(new_fd).emplace();
+    FileDescriptor& new_descriptor = file_descriptors[new_fd].emplace();
    new_descriptor.socket = std::move(result.socket);
    new_descriptor.is_connection_based = descriptor.is_connection_based;
@@ -561,7 +561,7 @@ Errno BSD::BindImpl(s32 fd, const std::vector<u8>& addr) {
    SockAddrIn addr_in;
    std::memcpy(&addr_in, addr.data(), sizeof(addr_in));
-    return Translate(GetFileDescriptor(fd)->socket->Bind(Translate(addr_in)));
+    return Translate(file_descriptors[fd]->socket->Bind(Translate(addr_in)));
 }
 Errno BSD::ConnectImpl(s32 fd, const std::vector<u8>& addr) {
@@ -573,7 +573,7 @@ Errno BSD::ConnectImpl(s32 fd, const std::vector<u8>& addr) {
    SockAddrIn addr_in;
    std::memcpy(&addr_in, addr.data(), sizeof(addr_in));
-    return Translate(GetFileDescriptor(fd)->socket->Connect(Translate(addr_in)));
+    return Translate(file_descriptors[fd]->socket->Connect(Translate(addr_in)));
 }
 Errno BSD::GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer) {
@@ -581,7 +581,7 @@ Errno BSD::GetPeerNameImpl(s32 fd, std::vector<u8>& write_buffer) {
        return Errno::BADF;
    }
-    const auto [addr_in, bsd_errno] = GetFileDescriptor(fd)->socket->GetPeerName();
+    const auto [addr_in, bsd_errno] = file_descriptors[fd]->socket->GetPeerName();
    if (bsd_errno != Network::Errno::SUCCESS) {
        return Translate(bsd_errno);
    }
@@ -597,7 +597,7 @@ Errno BSD::GetSockNameImpl(s32 fd, std::vector<u8>& write_buffer) {
        return Errno::BADF;
    }
-    const auto [addr_in, bsd_errno] = GetFileDescriptor(fd)->socket->GetSockName();
+    const auto [addr_in, bsd_errno] = file_descriptors[fd]->socket->GetSockName();
    if (bsd_errno != Network::Errno::SUCCESS) {
        return Translate(bsd_errno);
    }
@@ -612,7 +612,7 @@ Errno BSD::ListenImpl(s32 fd, s32 backlog) {
    if (!IsFileDescriptorValid(fd)) {
        return Errno::BADF;
    }
-    return Translate(GetFileDescriptor(fd)->socket->Listen(backlog));
+    return Translate(file_descriptors[fd]->socket->Listen(backlog));
 }
 std::pair<s32, Errno> BSD::FcntlImpl(s32 fd, FcntlCmd cmd, s32 arg) {
@@ -620,14 +620,14 @@ std::pair<s32, Errno> BSD::FcntlImpl(s32 fd, FcntlCmd cmd, s32 arg) {
        return {-1, Errno::BADF};
    }
-    FileDescriptor& descriptor = *GetFileDescriptor(fd);
+    FileDescriptor& descriptor = *file_descriptors[fd];
    switch (cmd) {
    case FcntlCmd::GETFL:
        ASSERT(arg == 0);
        return {descriptor.flags, Errno::SUCCESS};
    case FcntlCmd::SETFL: {
-        const bool enable = (static_cast<u32>(arg) & FLAG_O_NONBLOCK) != 0;
+        const bool enable = (arg & FLAG_O_NONBLOCK) != 0;
        const Errno bsd_errno = Translate(descriptor.socket->SetNonBlock(enable));
        if (bsd_errno != Errno::SUCCESS) {
            return {-1, bsd_errno};
@@ -648,7 +648,7 @@ Errno BSD::SetSockOptImpl(s32 fd, u32 level, OptName optname, size_t optlen, con
        return Errno::BADF;
    }
-    Network::Socket* const socket = GetFileDescriptor(fd)->socket.get();
+    Network::Socket* const socket = file_descriptors[fd]->socket.get();
    if (optname == OptName::LINGER) {
        ASSERT(optlen == sizeof(Linger));
@@ -689,14 +689,14 @@ Errno BSD::ShutdownImpl(s32 fd, s32 how) {
        return Errno::BADF;
    }
    const Network::ShutdownHow host_how = Translate(static_cast<ShutdownHow>(how));
-    return Translate(GetFileDescriptor(fd)->socket->Shutdown(host_how));
+    return Translate(file_descriptors[fd]->socket->Shutdown(host_how));
 }
 std::pair<s32, Errno> BSD::RecvImpl(s32 fd, u32 flags, std::vector<u8>& message) {
    if (!IsFileDescriptorValid(fd)) {
        return {-1, Errno::BADF};
    }
-    return Translate(GetFileDescriptor(fd)->socket->Recv(flags, message));
+    return Translate(file_descriptors[fd]->socket->Recv(flags, message));
 }
 std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& message,
@@ -705,7 +705,7 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess
        return {-1, Errno::BADF};
    }
-    FileDescriptor& descriptor = *GetFileDescriptor(fd);
+    FileDescriptor& descriptor = *file_descriptors[fd];
    Network::SockAddrIn addr_in{};
    Network::SockAddrIn* p_addr_in = nullptr;
@@ -719,7 +719,7 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess
    // Apply flags
    if ((flags & FLAG_MSG_DONTWAIT) != 0) {
        flags &= ~FLAG_MSG_DONTWAIT;
-        if ((static_cast<u32>(descriptor.flags) & FLAG_O_NONBLOCK) == 0) {
+        if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
            descriptor.socket->SetNonBlock(true);
        }
    }
@@ -727,7 +727,7 @@ std::pair<s32, Errno> BSD::RecvFromImpl(s32 fd, u32 flags, std::vector<u8>& mess
    const auto [ret, bsd_errno] = Translate(descriptor.socket->RecvFrom(flags, message, p_addr_in));
    // Restore original state
-    if ((static_cast<u32>(descriptor.flags) & FLAG_O_NONBLOCK) == 0) {
+    if ((descriptor.flags & FLAG_O_NONBLOCK) == 0) {
        descriptor.socket->SetNonBlock(false);
    }
@@ -748,7 +748,7 @@ std::pair<s32, Errno> BSD::SendImpl(s32 fd, u32 flags, const std::vector<u8>& me
    if (!IsFileDescriptorValid(fd)) {
        return {-1, Errno::BADF};
    }
-    return Translate(GetFileDescriptor(fd)->socket->Send(message, flags));
+    return Translate(file_descriptors[fd]->socket->Send(message, flags));
 }
 std::pair<s32, Errno> BSD::SendToImpl(s32 fd, u32 flags, const std::vector<u8>& message,
@@ -767,8 +767,7 @@ std::pair<s32, Errno> BSD::SendToImpl(s32 fd, u32 flags, const std::vector<u8>&
        p_addr_in = &addr_in;
    }
-    const auto& descriptor = GetFileDescriptor(fd);
+    return Translate(file_descriptors[fd]->socket->SendTo(flags, message, p_addr_in));
-    return Translate(descriptor->socket->SendTo(flags, message, p_addr_in));
 }
 Errno BSD::CloseImpl(s32 fd) {
@@ -776,21 +775,20 @@ Errno BSD::CloseImpl(s32 fd) {
        return Errno::BADF;
    }
-    auto& descriptor = GetFileDescriptor(fd);
+    const Errno bsd_errno = Translate(file_descriptors[fd]->socket->Close());
-    const Errno bsd_errno = Translate(descriptor->socket->Close());
    if (bsd_errno != Errno::SUCCESS) {
        return bsd_errno;
    }
    LOG_INFO(Service, "Close socket fd={}", fd);
-    descriptor.reset();
+    file_descriptors[fd].reset();
    return bsd_errno;
 }
 s32 BSD::FindFreeFileDescriptorHandle() noexcept {
    for (s32 fd = 0; fd < static_cast<s32>(file_descriptors.size()); ++fd) {
-        if (!GetFileDescriptor(fd)) {
+        if (!file_descriptors[fd]) {
            return fd;
        }
    }
@@ -802,7 +800,7 @@ bool BSD::IsFileDescriptorValid(s32 fd) const noexcept {
        LOG_ERROR(Service, "Invalid file descriptor handle={}", fd);
        return false;
    }
-    if (!GetFileDescriptor(fd)) {
+    if (!file_descriptors[fd]) {
        LOG_ERROR(Service, "File descriptor handle={} is not allocated", fd);
        return false;
    }
@@ -815,12 +813,10 @@ bool BSD::IsBlockingSocket(s32 fd) const noexcept {
    if (fd > static_cast<s32>(MAX_FD) || fd < 0) {
        return false;
    }
+    if (!file_descriptors[fd]) {
-    const auto& descriptor = GetFileDescriptor(fd);
-    if (!descriptor) {
        return false;
    }
-    return (static_cast<u32>(descriptor->flags) & FLAG_O_NONBLOCK) != 0;
+    return (file_descriptors[fd]->flags & FLAG_O_NONBLOCK) != 0;
 }
 void BSD::BuildErrnoResponse(Kernel::HLERequestContext& ctx, Errno bsd_errno) const noexcept {
@@ -831,14 +827,6 @@ void BSD::BuildErrnoResponse(Kernel::HLERequestContext& ctx, Errno bsd_errno) co
    rb.PushEnum(bsd_errno);
 }
-std::optional<BSD::FileDescriptor>& BSD::GetFileDescriptor(s32 fd) {
-    return file_descriptors[static_cast<u32>(fd)];
-}
-const std::optional<BSD::FileDescriptor>& BSD::GetFileDescriptor(s32 fd) const {
-    return file_descriptors[static_cast<u32>(fd)];
-}
 BSD::BSD(Core::System& system, const char* name)
    : ServiceFramework(name), worker_pool{system, this} {
    // clang-format off
diff --git a/src/core/hle/service/sockets/bsd.h b/src/core/hle/service/sockets/bsd.h
index ac9523d83..357531951 100644
--- a/src/core/hle/service/sockets/bsd.h
+++ b/src/core/hle/service/sockets/bsd.h
@@ -167,9 +167,6 @@ private:
    void BuildErrnoResponse(Kernel::HLERequestContext& ctx, Errno bsd_errno) const noexcept;
-    std::optional<FileDescriptor>& GetFileDescriptor(s32 fd);
-    const std::optional<FileDescriptor>& GetFileDescriptor(s32 fd) const;
    std::array<std::optional<FileDescriptor>, MAX_FD> file_descriptors;
    BlockingWorkerPool<BSD, PollWork, AcceptWork, ConnectWork, RecvWork, RecvFromWork, SendWork,
diff --git a/src/core/hle/service/sockets/sockets_translate.cpp b/src/core/hle/service/sockets/sockets_translate.cpp
index 50c2a455d..2e626fd86 100644
--- a/src/core/hle/service/sockets/sockets_translate.cpp
+++ b/src/core/hle/service/sockets/sockets_translate.cpp
@@ -64,7 +64,6 @@ Network::Type Translate(Type type) {
        return Network::Type::DGRAM;
    default:
        UNIMPLEMENTED_MSG("Unimplemented type={}", static_cast<int>(type));
-        return {};
    }
 }
diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp
index df0ed924d..bdf0439f2 100644
--- a/src/core/hle/service/time/time_zone_manager.cpp
+++ b/src/core/hle/service/time/time_zone_manager.cpp
@@ -117,8 +117,7 @@ static constexpr int GetMonthLength(bool is_leap_year, int month) {
    constexpr std::array<int, 12> month_lengths{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
    constexpr std::array<int, 12> month_lengths_leap{31, 29, 31, 30, 31, 30,
                                                     31, 31, 30, 31, 30, 31};
-    const auto month_index = static_cast<u32>(month);
+    return is_leap_year ? month_lengths_leap[month] : month_lengths[month];
-    return is_leap_year ? month_lengths_leap[month_index] : month_lengths[month_index];
 }
 static constexpr bool IsDigit(char value) {
@@ -321,7 +320,7 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
    int dest_len{};
    int dest_offset{};
    const char* dest_name{name + offset};
-    if (rule.chars.size() < static_cast<std::size_t>(char_count)) {
+    if (rule.chars.size() < std::size_t(char_count)) {
        return {};
    }
@@ -344,7 +343,7 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
            return {};
        }
        char_count += dest_len + 1;
-        if (rule.chars.size() < static_cast<std::size_t>(char_count)) {
+        if (rule.chars.size() < std::size_t(char_count)) {
            return {};
        }
        if (name[offset] != '\0' && name[offset] != ',' && name[offset] != ';') {
@@ -387,7 +386,7 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
            rule.default_type = 0;
            s64 jan_first{};
-            u32 time_count{};
+            int time_count{};
            int jan_offset{};
            int year_beginning{epoch_year};
            do {
@@ -415,7 +414,7 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
                if (is_reversed ||
                    (start_time < end_time &&
                     (end_time - start_time < (year_seconds + (std_offset - dest_offset))))) {
-                    if (rule.ats.size() - 2 < time_count) {
+                    if (rule.ats.size() - 2 < std::size_t(time_count)) {
                        break;
                    }
@@ -439,7 +438,7 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
                }
                jan_offset = 0;
            }
-            rule.time_count = static_cast<s32>(time_count);
+            rule.time_count = time_count;
            if (time_count == 0) {
                rule.type_count = 1;
            } else if (years_per_repeat < year - year_beginning) {
@@ -452,30 +451,26 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
            }
            s64 their_std_offset{};
-            for (u32 index = 0; index < static_cast<u32>(rule.time_count); ++index) {
+            for (int index{}; index < rule.time_count; ++index) {
                const s8 type{rule.types[index]};
-                const auto& tti = rule.ttis[static_cast<u8>(type)];
+                if (rule.ttis[type].is_standard_time_daylight) {
+                    their_std_offset = -rule.ttis[type].gmt_offset;
-                if (tti.is_standard_time_daylight) {
-                    their_std_offset = -tti.gmt_offset;
                }
            }
            s64 their_offset{their_std_offset};
-            for (u32 index = 0; index < static_cast<u32>(rule.time_count); ++index) {
+            for (int index{}; index < rule.time_count; ++index) {
                const s8 type{rule.types[index]};
-                const auto& tti = rule.ttis[static_cast<u8>(type)];
+                rule.types[index] = rule.ttis[type].is_dst ? 1 : 0;
+                if (!rule.ttis[type].is_gmt) {
-                rule.types[index] = tti.is_dst ? 1 : 0;
+                    if (!rule.ttis[type].is_standard_time_daylight) {
-                if (!tti.is_gmt) {
-                    if (!tti.is_standard_time_daylight) {
                        rule.ats[index] += dest_offset - their_std_offset;
                    } else {
                        rule.ats[index] += std_offset - their_std_offset;
                    }
                }
-                their_offset = -tti.gmt_offset;
+                their_offset = -rule.ttis[type].gmt_offset;
-                if (!tti.is_dst) {
+                if (!rule.ttis[type].is_dst) {
                    their_std_offset = their_offset;
                }
            }
@@ -499,16 +494,16 @@ static bool ParsePosixName(const char* name, TimeZoneRule& rule) {
    }
    rule.char_count = char_count;
-    for (std::size_t index = 0; index < static_cast<std::size_t>(std_len); ++index) {
+    for (int index{}; index < std_len; ++index) {
        rule.chars[index] = std_name[index];
    }
-    rule.chars[static_cast<size_t>(std_len++)] = '\0';
+    rule.chars[std_len++] = '\0';
    if (dest_len != 0) {
-        for (int index = 0; index < dest_len; ++index) {
+        for (int index{}; index < dest_len; ++index) {
-            rule.chars[static_cast<std::size_t>(std_len + index)] = dest_name[index];
+            rule.chars[std_len + index] = dest_name[index];
        }
-        rule.chars[static_cast<std::size_t>(std_len + dest_len)] = '\0';
+        rule.chars[std_len + dest_len] = '\0';
    }
    return true;
@@ -536,33 +531,33 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
    int time_count{};
    u64 read_offset = sizeof(TzifHeader);
-    for (size_t index = 0; index < static_cast<size_t>(time_zone_rule.time_count); ++index) {
+    for (int index{}; index < time_zone_rule.time_count; ++index) {
        s64_be at{};
        vfs_file->ReadObject<s64_be>(&at, read_offset);
        time_zone_rule.types[index] = 1;
-        if (time_count != 0 && at <= time_zone_rule.ats[static_cast<size_t>(time_count) - 1]) {
+        if (time_count != 0 && at <= time_zone_rule.ats[time_count - 1]) {
-            if (at < time_zone_rule.ats[static_cast<size_t>(time_count) - 1]) {
+            if (at < time_zone_rule.ats[time_count - 1]) {
                return {};
            }
            time_zone_rule.types[index - 1] = 0;
            time_count--;
        }
-        time_zone_rule.ats[static_cast<size_t>(time_count++)] = at;
+        time_zone_rule.ats[time_count++] = at;
        read_offset += sizeof(s64_be);
    }
    time_count = 0;
-    for (size_t index = 0; index < static_cast<size_t>(time_zone_rule.time_count); ++index) {
+    for (int index{}; index < time_zone_rule.time_count; ++index) {
-        const auto type{static_cast<s8>(*vfs_file->ReadByte(read_offset))};
+        const u8 type{*vfs_file->ReadByte(read_offset)};
-        read_offset += sizeof(s8);
+        read_offset += sizeof(u8);
        if (time_zone_rule.time_count <= type) {
            return {};
        }
        if (time_zone_rule.types[index] != 0) {
-            time_zone_rule.types[static_cast<size_t>(time_count++)] = type;
+            time_zone_rule.types[time_count++] = type;
        }
    }
    time_zone_rule.time_count = time_count;
-    for (size_t index = 0; index < static_cast<size_t>(time_zone_rule.type_count); ++index) {
+    for (int index{}; index < time_zone_rule.type_count; ++index) {
        TimeTypeInfo& ttis{time_zone_rule.ttis[index]};
        u32_be gmt_offset{};
        vfs_file->ReadObject<u32_be>(&gmt_offset, read_offset);
@@ -584,11 +579,10 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
        ttis.abbreviation_list_index = abbreviation_list_index;
    }
-    vfs_file->ReadArray(time_zone_rule.chars.data(), static_cast<u32>(time_zone_rule.char_count),
+    vfs_file->ReadArray(time_zone_rule.chars.data(), time_zone_rule.char_count, read_offset);
-                        read_offset);
+    time_zone_rule.chars[time_zone_rule.char_count] = '\0';
-    time_zone_rule.chars[static_cast<u32>(time_zone_rule.char_count)] = '\0';
+    read_offset += time_zone_rule.char_count;
-    read_offset += static_cast<u64>(time_zone_rule.char_count);
+    for (int index{}; index < time_zone_rule.type_count; ++index) {
-    for (size_t index = 0; index < static_cast<size_t>(time_zone_rule.type_count); ++index) {
        if (header.ttis_std_count == 0) {
            time_zone_rule.ttis[index].is_standard_time_daylight = false;
        } else {
@@ -601,7 +595,7 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
        }
    }
-    for (size_t index = 0; index < static_cast<size_t>(time_zone_rule.type_count); ++index) {
+    for (int index{}; index < time_zone_rule.type_count; ++index) {
        if (header.ttis_std_count == 0) {
            time_zone_rule.ttis[index].is_gmt = false;
        } else {
@@ -625,14 +619,13 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
    }
    std::array<char, time_zone_name_max + 1> temp_name{};
-    vfs_file->ReadArray(temp_name.data(), static_cast<size_t>(bytes_read), read_offset);
+    vfs_file->ReadArray(temp_name.data(), bytes_read, read_offset);
-    if (bytes_read > 2 && temp_name[0] == '\n' &&
+    if (bytes_read > 2 && temp_name[0] == '\n' && temp_name[bytes_read - 1] == '\n' &&
-        temp_name[static_cast<u64>(bytes_read - 1)] == '\n' &&
+        std::size_t(time_zone_rule.type_count) + 2 <= time_zone_rule.ttis.size()) {
-        static_cast<std::size_t>(time_zone_rule.type_count) + 2 <= time_zone_rule.ttis.size()) {
+        temp_name[bytes_read - 1] = '\0';
-        temp_name[static_cast<u64>(bytes_read - 1)] = '\0';
        std::array<char, time_zone_name_max> name{};
-        std::memcpy(name.data(), temp_name.data() + 1, static_cast<std::size_t>(bytes_read - 1));
+        std::memcpy(name.data(), temp_name.data() + 1, std::size_t(bytes_read - 1));
        TimeZoneRule temp_rule;
        if (ParsePosixName(name.data(), temp_rule)) {
@@ -649,24 +642,24 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
    s32 default_type{};
    for (default_type = 0; default_type < time_zone_rule.time_count; default_type++) {
-        if (time_zone_rule.types[static_cast<u32>(default_type)] == 0) {
+        if (time_zone_rule.types[default_type] == 0) {
            break;
        }
    }
    default_type = default_type < time_zone_rule.time_count ? -1 : 0;
    if (default_type < 0 && time_zone_rule.time_count > 0 &&
-        time_zone_rule.ttis[static_cast<u8>(time_zone_rule.types[0])].is_dst) {
+        time_zone_rule.ttis[time_zone_rule.types[0]].is_dst) {
        default_type = time_zone_rule.types[0];
        while (--default_type >= 0) {
-            if (!time_zone_rule.ttis[static_cast<u32>(default_type)].is_dst) {
+            if (!time_zone_rule.ttis[default_type].is_dst) {
                break;
            }
        }
    }
    if (default_type < 0) {
        default_type = 0;
-        while (time_zone_rule.ttis[static_cast<u32>(default_type)].is_dst) {
+        while (time_zone_rule.ttis[default_type].is_dst) {
            if (++default_type >= time_zone_rule.type_count) {
                default_type = 0;
                break;
@@ -756,12 +749,12 @@ static ResultCode ToCalendarTimeInternal(const TimeZoneRule& rules, s64 time,
                                         CalendarTimeInternal& calendar_time,
                                         CalendarAdditionalInfo& calendar_additional_info) {
    if ((rules.go_ahead && time < rules.ats[0]) ||
-        (rules.go_back && time > rules.ats[static_cast<size_t>(rules.time_count - 1)])) {
+        (rules.go_back && time > rules.ats[rules.time_count - 1])) {
        s64 seconds{};
        if (time < rules.ats[0]) {
            seconds = rules.ats[0] - time;
        } else {
-            seconds = time - rules.ats[static_cast<size_t>(rules.time_count - 1)];
+            seconds = time - rules.ats[rules.time_count - 1];
        }
        seconds--;
@@ -774,8 +767,7 @@ static ResultCode ToCalendarTimeInternal(const TimeZoneRule& rules, s64 time,
        } else {
            new_time -= seconds;
        }
-        if (new_time < rules.ats[0] &&
+        if (new_time < rules.ats[0] && new_time > rules.ats[rules.time_count - 1]) {
-            new_time > rules.ats[static_cast<size_t>(rules.time_count - 1)]) {
            return ERROR_TIME_NOT_FOUND;
        }
        if (const ResultCode result{
@@ -799,27 +791,25 @@ static ResultCode ToCalendarTimeInternal(const TimeZoneRule& rules, s64 time,
        s32 low{1};
        s32 high{rules.time_count};
        while (low < high) {
-            const s32 mid{(low + high) >> 1};
+            s32 mid{(low + high) >> 1};
-            if (time < rules.ats[static_cast<size_t>(mid)]) {
+            if (time < rules.ats[mid]) {
                high = mid;
            } else {
                low = mid + 1;
            }
        }
-        tti_index = rules.types[static_cast<size_t>(low - 1)];
+        tti_index = rules.types[low - 1];
    }
-    if (const ResultCode result{
+    if (const ResultCode result{CreateCalendarTime(time, rules.ttis[tti_index].gmt_offset,
-            CreateCalendarTime(time, rules.ttis[static_cast<u32>(tti_index)].gmt_offset,
+                                                   calendar_time, calendar_additional_info)};
-                               calendar_time, calendar_additional_info)};
        result != RESULT_SUCCESS) {
        return result;
    }
-    const auto& tti = rules.ttis[static_cast<size_t>(tti_index)];
+    calendar_additional_info.is_dst = rules.ttis[tti_index].is_dst;
-    calendar_additional_info.is_dst = tti.is_dst;
+    const char* time_zone{&rules.chars[rules.ttis[tti_index].abbreviation_list_index]};
-    const char* time_zone{&rules.chars[static_cast<size_t>(tti.abbreviation_list_index)]};
+    for (int index{}; time_zone[index] != '\0'; ++index) {
-    for (size_t index = 0; time_zone[index] != '\0'; ++index) {
        calendar_additional_info.timezone_name[index] = time_zone[index];
    }
    return RESULT_SUCCESS;
diff --git a/src/core/hle/service/time/time_zone_service.cpp b/src/core/hle/service/time/time_zone_service.cpp
index 8a0227021..ff3a10b3e 100644
--- a/src/core/hle/service/time/time_zone_service.cpp
+++ b/src/core/hle/service/time/time_zone_service.cpp
@@ -49,12 +49,12 @@ void ITimeZoneService::LoadTimeZoneRule(Kernel::HLERequestContext& ctx) {
    const auto raw_location_name{rp.PopRaw<std::array<u8, 0x24>>()};
    std::string location_name;
-    for (const auto byte : raw_location_name) {
+    for (const auto& byte : raw_location_name) {
        // Strip extra bytes
        if (byte == '\0') {
            break;
        }
-        location_name.push_back(static_cast<char>(byte));
+        location_name.push_back(byte);
    }
    LOG_DEBUG(Service_Time, "called, location_name={}", location_name);