diff --git a/nx/include/switch/services/fs.h b/nx/include/switch/services/fs.h
index 35bf62a3..f5c5f13e 100644
--- a/nx/include/switch/services/fs.h
+++ b/nx/include/switch/services/fs.h
@@ -238,7 +238,7 @@ Service* fsGetServiceSession(void);
 Result fsOpenBisStorage(FsStorage* out, FsBisStorageId PartitionId);
 Result fsOpenBisFileSystem(FsFileSystem* out, FsBisStorageId PartitionId, const char* string);
 
-Result fsCreateSaveDataFileSystemBySystemSaveDataId(FsSave* save, FsSaveCreate* create);
+Result fsCreateSaveDataFileSystemBySystemSaveDataId(const FsSave* save, const FsSaveCreate* create);
 
 Result fsIsExFatSupported(bool* out);
 
diff --git a/nx/source/services/fs.c b/nx/source/services/fs.c
index 5a75d630..932abb30 100644
--- a/nx/source/services/fs.c
+++ b/nx/source/services/fs.c
@@ -150,7 +150,7 @@ Result fsOpenBisFileSystem(FsFileSystem* out, FsBisStorageId PartitionId, const
     return rc;
 }
 
-Result fsCreateSaveDataFileSystemBySystemSaveDataId(FsSave* save, FsSaveCreate* create) {
+Result fsCreateSaveDataFileSystemBySystemSaveDataId(const FsSave* save, const FsSaveCreate* create) {
     IpcCommand c;
     ipcInitialize(&c);
 
@@ -702,19 +702,18 @@ Result fsIsExFatSupported(bool* out)
 
 // Wrapper(s) for fsCreateSaveDataFileSystemBySystemSaveDataId.
 Result fsCreate_SystemSaveDataWithOwner(FsSaveDataSpaceId SaveDataSpaceId, u64 saveID, u128 userID, u64 ownerId, u64 size, u64 journalSize, u32 flags) {
-    FsSave save;
-    FsSaveCreate create;
-
-    memset(&save, 0, sizeof(save));
-    save.userID = userID;
-    save.saveID = saveID;
-    memset(&create, 0, sizeof(create));
-    create.size = size;
-    create.journalSize = journalSize;
-    create.blockSize = 0x4000;
-    create.ownerId = ownerId; 
-    create.flags = flags;
-    create.SaveDataSpaceId = SaveDataSpaceId;
+    FsSave save = {
+        .userID = userID,
+        .saveID = saveID,
+    };
+    FsSaveCreate create = {
+        .size = size,
+        .journalSize = journalSize,
+        .blockSize = 0x4000,
+        .ownerId = ownerId,
+        .flags = flags,
+        .SaveDataSpaceId = SaveDataSpaceId,
+    };
 
     return fsCreateSaveDataFileSystemBySystemSaveDataId(&save, &create);
 }