diff --git a/src/Ryujinx.Horizon/Am/Ipc/Storage/StorageAccessor.cs b/src/Ryujinx.Horizon/Am/Ipc/Storage/StorageAccessor.cs
index 13e71ce59..56b4e7651 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Storage/StorageAccessor.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Storage/StorageAccessor.cs
@@ -2,6 +2,7 @@ using Ryujinx.Common.Logging;
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am.Storage;
 using Ryujinx.Horizon.Sdk.Sf;
+using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using System;
 
 namespace Ryujinx.Horizon.Am.Ipc.Storage
@@ -18,7 +19,7 @@ namespace Ryujinx.Horizon.Am.Ipc.Storage
         }
 
         [CmifCommand(10)]
-        public Result Write(long arg0, ReadOnlySpan<byte> span)
+        public Result Write(long offset, [Buffer(HipcBufferFlags.In | HipcBufferFlags.AutoSelect)] ReadOnlySpan<byte> span)
         {
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
@@ -26,7 +27,7 @@ namespace Ryujinx.Horizon.Am.Ipc.Storage
         }
 
         [CmifCommand(11)]
-        public Result Read(long arg0, ReadOnlySpan<byte> span)
+        public Result Read(long offset, [Buffer(HipcBufferFlags.Out | HipcBufferFlags.AutoSelect)] Span<byte> span)
         {
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
diff --git a/src/Ryujinx.Horizon/Am/Ipc/Storage/TransferStorageAccessor.cs b/src/Ryujinx.Horizon/Am/Ipc/Storage/TransferStorageAccessor.cs
index 7efc59687..ac573907f 100644
--- a/src/Ryujinx.Horizon/Am/Ipc/Storage/TransferStorageAccessor.cs
+++ b/src/Ryujinx.Horizon/Am/Ipc/Storage/TransferStorageAccessor.cs
@@ -17,10 +17,10 @@ namespace Ryujinx.Horizon.Am.Ipc.Storage
         }
 
         [CmifCommand(1)]
-        public Result GetHandle(out int arg0, out ulong arg1)
+        public Result GetHandle([CopyHandle] out int handle, out ulong size)
         {
-            arg0 = 0;
-            arg1 = 0;
+            handle = 0;
+            size = 0;
             Logger.Stub?.PrintStub(LogClass.ServiceAm);
 
             return Result.Success;
diff --git a/src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageAccessor.cs b/src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageAccessor.cs
index 5dfe0d08e..2b9a7fe0a 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageAccessor.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageAccessor.cs
@@ -7,7 +7,7 @@ namespace Ryujinx.Horizon.Sdk.Am.Storage
     interface IStorageAccessor : IServiceObject
     {
         Result GetSize(out long size);
-        Result Write(long arg0, ReadOnlySpan<byte> span);
-        Result Read(long arg0, ReadOnlySpan<byte> span);
+        Result Write(long offset, ReadOnlySpan<byte> span);
+        Result Read(long offset, Span<byte> span);
     }
 }
diff --git a/src/Ryujinx.Horizon/Sdk/Am/Storage/ITransferStorageAccessor.cs b/src/Ryujinx.Horizon/Sdk/Am/Storage/ITransferStorageAccessor.cs
index a7d2aa2c2..e5482060a 100644
--- a/src/Ryujinx.Horizon/Sdk/Am/Storage/ITransferStorageAccessor.cs
+++ b/src/Ryujinx.Horizon/Sdk/Am/Storage/ITransferStorageAccessor.cs
@@ -6,6 +6,6 @@ namespace Ryujinx.Horizon.Sdk.Am.Storage
     interface ITransferStorageAccessor : IServiceObject
     {
         Result GetSize(out long size);
-        Result GetHandle(out int arg0, out ulong arg1);
+        Result GetHandle(out int handle, out ulong size);
     }
 }