diff --git a/libraries/libstratosphere/source/pgl/pgl_shell_api.cpp b/libraries/libstratosphere/source/pgl/pgl_shell_api.cpp
index 4b87961ff..336fcac91 100644
--- a/libraries/libstratosphere/source/pgl/pgl_shell_api.cpp
+++ b/libraries/libstratosphere/source/pgl/pgl_shell_api.cpp
@@ -137,7 +137,7 @@ namespace ams::pgl {
     }
     
     Result EnableApplicationCrashReport2(os::ProcessId process_id, bool enabled) {
-        R_RETURN(::pglEnableApplicationCrashReport2(process_id, enabled));
+        R_RETURN(::pglEnableApplicationCrashReport2(static_cast<u64>(process_id), enabled));
     }
     #else
     Result Initialize() {
diff --git a/libraries/libstratosphere/source/pgl/srv/pgl_srv_shell.cpp b/libraries/libstratosphere/source/pgl/srv/pgl_srv_shell.cpp
index 7178e3a29..2fff47715 100644
--- a/libraries/libstratosphere/source/pgl/srv/pgl_srv_shell.cpp
+++ b/libraries/libstratosphere/source/pgl/srv/pgl_srv_shell.cpp
@@ -499,7 +499,7 @@ namespace ams::pgl::srv {
     void EnableApplicationCrashReport2(os::ProcessId process_id, bool enabled) {
         /* Find the data for the process. */
         std::scoped_lock lk(g_process_data_mutex);
-        ProcessData *data = FindProcessData(*process_id);
+        ProcessData *data = FindProcessData(process_id);
 
         /* It's okay if we aren't tracking the process. */
         if (data != nullptr) {
diff --git a/libraries/libstratosphere/source/scs/scs_shell.cpp b/libraries/libstratosphere/source/scs/scs_shell.cpp
index 841b36e41..89794ce61 100644
--- a/libraries/libstratosphere/source/scs/scs_shell.cpp
+++ b/libraries/libstratosphere/source/scs/scs_shell.cpp
@@ -279,11 +279,11 @@ namespace ams::scs {
         void EventHandlerThread(void *) {
             /* Get event observer. */
             pgl::EventObserver observer;
-            R_ABORT_UNLESS(pgl::GetEventObserver(std::addressof(observer)));
+            R_ABORT_UNLESS(pgl::CreateShellEvent(std::addressof(observer)));
 
             /* Get the observer's event. */
             os::SystemEventType shell_event;
-            R_ABORT_UNLESS(observer.GetSystemEvent(std::addressof(shell_event)));
+            R_ABORT_UNLESS(observer.GetShellEvent(std::addressof(shell_event)));
 
             /* Loop handling events. */
             while (true) {
@@ -294,7 +294,7 @@ namespace ams::scs {
                 while (true) {
                     /* Get the next event info. */
                     pm::ProcessEventInfo event_info;
-                    if (R_FAILED(observer.GetProcessEventInfo(std::addressof(event_info)))) {
+                    if (R_FAILED(observer.GetShellEventInfo(std::addressof(event_info)))) {
                         break;
                     }