diff --git a/nx/include/switch/services/sm.h b/nx/include/switch/services/sm.h
index 058afc92..d1e6ced4 100644
--- a/nx/include/switch/services/sm.h
+++ b/nx/include/switch/services/sm.h
@@ -54,7 +54,3 @@ Result smUnregisterService(const char* name);
 bool   smHasInitialized(void);
 u64    smEncodeName(const char* name);
 void   smAddOverrideHandle(u64 name, Handle handle);
-
-bool serviceIsOverride(Service* s);
-bool serviceIsInitialized(Service* s);
-void serviceClose(Service* s);
diff --git a/nx/source/runtime/env.c b/nx/source/runtime/env.c
index ab4da3d3..7e8a408c 100644
--- a/nx/source/runtime/env.c
+++ b/nx/source/runtime/env.c
@@ -94,7 +94,7 @@ void envParse(void* ctx, Handle main_thread)
             if (ent->Flags & IsMandatory)
             {
                 // Encountered unknown but mandatory key, bail back to loader.
-                g_loaderRetAddr(346 | ((100 + ent->Key) << 9));
+                g_loaderRetAddr(MAKERESULT(346, 100 + ent->Key));
             }
 
             break;