diff --git a/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp b/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp
index 86411dffc..735c49847 100644
--- a/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp
+++ b/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp
@@ -294,7 +294,7 @@ namespace ams::ncm {
     Result ContentMetaDatabaseImpl::Commit() {
         R_TRY(this->EnsureEnabled());
         R_TRY(this->kvs->Save());
-        return fsdevCommitDevice(this->mount_name);
+        return fs::CommitSaveData(this->mount_name);
     }
 
     Result ContentMetaDatabaseImpl::HasContent(sf::Out<bool> out, const ContentMetaKey &key, const ContentId &content_id) {
diff --git a/stratosphere/ncm/source/ncm_main.cpp b/stratosphere/ncm/source/ncm_main.cpp
index ade855866..5b6d69e8a 100644
--- a/stratosphere/ncm/source/ncm_main.cpp
+++ b/stratosphere/ncm/source/ncm_main.cpp
@@ -72,6 +72,7 @@ void __appInit(void) {
 
     sm::DoWithSession([&]() {
         R_ABORT_UNLESS(fsInitialize());
+        R_ABORT_UNLESS(splInitialize());
     });
 
     ams::CheckApiVersion();
@@ -79,7 +80,7 @@ void __appInit(void) {
 
 void __appExit(void) {
     /* Cleanup services. */
-    fsdevUnmountAll();
+    splExit();
     fsExit();
 }