diff --git a/source/pm/pm_dmnt_api.cpp b/source/pm/pm_dmnt_api.cpp
index b42016d8..717a632f 100644
--- a/source/pm/pm_dmnt_api.cpp
+++ b/source/pm/pm_dmnt_api.cpp
@@ -25,16 +25,16 @@ namespace ams::pm::dmnt {
     }
 
     Result GetProcessId(os::ProcessId *out_process_id, const ncm::TitleId title_id) {
-        return pmdmntGetTitlePid(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(title_id));
+        return pmdmntGetProcessId(reinterpret_cast<u64 *>(out_process_id), static_cast<u64>(title_id));
     }
 
     Result GetApplicationProcessId(os::ProcessId *out_process_id) {
-        return pmdmntGetApplicationPid(reinterpret_cast<u64 *>(out_process_id));
+        return pmdmntGetApplicationProcessId(reinterpret_cast<u64 *>(out_process_id));
     }
 
     Result HookToCreateApplicationProcess(Handle *out_handle) {
         Event evt;
-        R_TRY(pmdmntEnableDebugForApplication(&evt));
+        R_TRY(pmdmntHookToCreateApplicationProcess(&evt));
         *out_handle = evt.revent;
         return ResultSuccess();
     }
diff --git a/source/pm/pm_info_api.cpp b/source/pm/pm_info_api.cpp
index 8b6eeead..d8c27d2a 100644
--- a/source/pm/pm_info_api.cpp
+++ b/source/pm/pm_info_api.cpp
@@ -30,7 +30,7 @@ namespace ams::pm::info {
     Result GetTitleId(ncm::TitleId *out_title_id, os::ProcessId process_id) {
         std::scoped_lock lk(g_info_lock);
 
-        return pminfoGetTitleId(reinterpret_cast<u64 *>(out_title_id), static_cast<u64>(process_id));
+        return pminfoGetProgramId(reinterpret_cast<u64 *>(out_title_id), static_cast<u64>(process_id));
     }
 
     Result GetProcessId(os::ProcessId *out_process_id, ncm::TitleId title_id) {
diff --git a/source/pm/pm_shell_api.cpp b/source/pm/pm_shell_api.cpp
index c71c6a91..513dc827 100644
--- a/source/pm/pm_shell_api.cpp
+++ b/source/pm/pm_shell_api.cpp
@@ -19,7 +19,9 @@ namespace ams::pm::shell {
 
     /* Shell API. */
     Result WEAK LaunchTitle(os::ProcessId *out_process_id, const ncm::TitleLocation &loc, u32 launch_flags) {
-        return pmshellLaunchProcess(launch_flags, static_cast<u64>(loc.title_id), loc.storage_id, reinterpret_cast<u64 *>(out_process_id));
+        static_assert(sizeof(ncm::TitleLocation) == sizeof(NcmProgramLocation));
+        static_assert(alignof(ncm::TitleLocation) == alignof(NcmProgramLocation));
+        return pmshellLaunchProgram(launch_flags, reinterpret_cast<const NcmProgramLocation *>(&loc), reinterpret_cast<u64 *>(out_process_id));
     }
 
 }
diff --git a/source/result/result_on_assertion.cpp b/source/result/result_on_assertion.cpp
index 848138fd..5b3da6a6 100644
--- a/source/result/result_on_assertion.cpp
+++ b/source/result/result_on_assertion.cpp
@@ -30,7 +30,7 @@ namespace ams::result::impl {
         AMS_ASSERT((ams::result::CallFatalOnResultAssertion));
 
         /* TODO: ams::fatal:: */
-        fatalSimple(result.GetValue());
+        fatalThrow(result.GetValue());
         while (true) { /* ... */ }
     }
 
diff --git a/source/updater/updater_api.cpp b/source/updater/updater_api.cpp
index 36242410..7072e9da 100644
--- a/source/updater/updater_api.cpp
+++ b/source/updater/updater_api.cpp
@@ -149,10 +149,10 @@ namespace ams::updater {
             NcmContentMetaKey *records = reinterpret_cast<NcmContentMetaKey *>(work_buffer);
 
             const auto title_type = GetNcmContentMetaType(mode);
-            u32 written_entries;
-            u32 total_entries;
+            s32 written_entries;
+            s32 total_entries;
             R_TRY(ncmContentMetaDatabaseList(&meta_db, &total_entries, &written_entries, records, MaxContentMetas * sizeof(*records), title_type, 0, 0, UINT64_MAX, NcmContentInstallType_Full));
-            if (total_entries == 0) {
+            if (total_entries <= 0) {
                 return ResultBootImagePackageNotFound();
             }
 
@@ -160,7 +160,7 @@ namespace ams::updater {
 
             /* Output is sorted, return the lowest valid exfat entry. */
             if (total_entries > 1) {
-                for (size_t i = 0; i < total_entries; i++) {
+                for (size_t i = 0; i < size_t(total_entries); i++) {
                     u8 attr;
                     R_TRY(ncmContentMetaDatabaseGetAttributes(&meta_db, &records[i], &attr));