diff --git a/nx/source/runtime/devices/socket.c b/nx/source/runtime/devices/socket.c
index 43a12a03..acc752c7 100644
--- a/nx/source/runtime/devices/socket.c
+++ b/nx/source/runtime/devices/socket.c
@@ -121,6 +121,9 @@ Result socketInitialize(const SocketInitConfig *config) {
     if(dev != -1)
         return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
 
+    ret = nifmInitialize();
+    if(R_FAILED(ret)) return ret;
+
     ret = bsdInitialize(&bcfg);
     if(R_SUCCEEDED(ret))
         dev = AddDevice(&g_socketDevoptab);
@@ -147,6 +150,7 @@ Result socketInitialize(const SocketInitConfig *config) {
 void socketExit(void) {
     RemoveDevice("soc:");
     bsdExit();
+    nifmExit();
 }
 
 Result socketGetLastBsdResult(void) {
diff --git a/nx/source/services/nifm.c b/nx/source/services/nifm.c
index 14338487..db421190 100644
--- a/nx/source/services/nifm.c
+++ b/nx/source/services/nifm.c
@@ -24,6 +24,8 @@ Result nifmInitialize(void) {
     Result rc;
     rc = smGetService(&g_nifmSrv, "nifm:u");
 
+    if (R_SUCCEEDED(rc)) rc = serviceConvertToDomain(&g_nifmSrv);
+
     if (R_SUCCEEDED(rc)) {
         if (kernelAbove300())
             rc = _nifmCreateGeneralService(&g_nifmIGS, 0); // What does this parameter do?
@@ -51,9 +53,9 @@ Result nifmGetCurrentIpAddress(u32* out) {
     struct {
         u64 magic;
         u64 cmd_id;
-    } * raw;
+    } *raw;
 
-    raw = ipcPrepareHeader(&c, sizeof(*raw));
+    raw = serviceIpcPrepareHeader(&g_nifmIGS, &c, sizeof(*raw));
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 12;
@@ -62,13 +64,15 @@ Result nifmGetCurrentIpAddress(u32* out) {
 
     if (R_SUCCEEDED(rc)) {
         IpcParsedCommand r;
-        ipcParse(&r);
 
         struct {
             u64 magic;
             u64 result;
             u32 out;
-        }* resp = r.Raw;
+        } *resp;
+
+        serviceIpcParse(&g_nifmIGS, &r, sizeof(*resp));
+        resp = r.Raw;
 
         rc = resp->result;
         *out = resp->out;
@@ -86,9 +90,9 @@ static Result _nifmCreateGeneralService(Service* out, u64 in) {
         u64 magic;
         u64 cmd_id;
         u64 param;
-    } PACKED* raw;
+    } PACKED *raw;
 
-    raw = ipcPrepareHeader(&c, sizeof(*raw));
+    raw = serviceIpcPrepareHeader(&g_nifmSrv, &c, sizeof(*raw));
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 5;
@@ -98,17 +102,19 @@ static Result _nifmCreateGeneralService(Service* out, u64 in) {
 
     if (R_SUCCEEDED(rc)) {
         IpcParsedCommand r;
-        ipcParse(&r);
 
         struct {
             u64 magic;
             u64 result;
-        }* resp = r.Raw;
+        } *resp;
+
+        serviceIpcParse(&g_nifmSrv, &r, sizeof(*resp));
+        resp = r.Raw;
 
         rc = resp->result;
 
         if (R_SUCCEEDED(rc))
-            serviceCreate(out, r.Handles[0]);
+            serviceCreateSubservice(out, &g_nifmSrv, &r, 0);
     }
 
     return rc;
@@ -121,9 +127,9 @@ static Result _nifmCreateGeneralServiceOld(Service* out) {
     struct {
         u64 magic;
         u64 cmd_id;
-    } PACKED* raw;
+    } PACKED *raw;
 
-    raw = ipcPrepareHeader(&c, sizeof(*raw));
+    raw = serviceIpcPrepareHeader(&g_nifmSrv, &c, sizeof(*raw));
 
     raw->magic = SFCI_MAGIC;
     raw->cmd_id = 4;
@@ -132,17 +138,19 @@ static Result _nifmCreateGeneralServiceOld(Service* out) {
 
     if (R_SUCCEEDED(rc)) {
         IpcParsedCommand r;
-        ipcParse(&r);
 
         struct {
             u64 magic;
             u64 result;
-        }* resp = r.Raw;
+        } *resp;
+
+        serviceIpcParse(&g_nifmSrv, &r, sizeof(*resp));
+        resp = r.Raw;
 
         rc = resp->result;
 
         if (R_SUCCEEDED(rc))
-            serviceCreate(out, r.Handles[0]);
+            serviceCreateSubservice(out, &g_nifmSrv, &r, 0);
     }
 
     return rc;