diff --git a/src/LibHac.Nand/FatFileSystemProvider.cs b/src/LibHac.Nand/FatFileSystemProvider.cs
index 6a994e21..d1cfb2c2 100644
--- a/src/LibHac.Nand/FatFileSystemProvider.cs
+++ b/src/LibHac.Nand/FatFileSystemProvider.cs
@@ -122,7 +122,7 @@ namespace LibHac.Nand
         public void CreateFile(string path, long size, CreateFileOptions options) => throw new NotSupportedException();
         public void RenameDirectory(string srcPath, string dstPath) => throw new NotSupportedException();
         public void RenameFile(string srcPath, string dstPath) => throw new NotSupportedException();
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
 
         private static FileAccess GetFileAccess(OpenMode mode)
         {
diff --git a/src/LibHac/IO/AesXtsFileSystem.cs b/src/LibHac/IO/AesXtsFileSystem.cs
index 837cb502..021f158d 100644
--- a/src/LibHac/IO/AesXtsFileSystem.cs
+++ b/src/LibHac/IO/AesXtsFileSystem.cs
@@ -199,7 +199,7 @@ namespace LibHac.IO
             BaseFileSystem.Commit();
         }
 
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId)
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId)
         {
             BaseFileSystem.QueryEntry(outBuffer, inBuffer, path, queryId);
         }
diff --git a/src/LibHac/IO/ConcatenationFileSystem.cs b/src/LibHac/IO/ConcatenationFileSystem.cs
index a36d0cea..4b539e95 100644
--- a/src/LibHac/IO/ConcatenationFileSystem.cs
+++ b/src/LibHac/IO/ConcatenationFileSystem.cs
@@ -218,7 +218,7 @@ namespace LibHac.IO
             BaseFileSystem.Commit();
         }
 
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId)
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId)
         {
             if(queryId != QueryId.MakeConcatFile) throw new NotSupportedException();
 
diff --git a/src/LibHac/IO/IFileSystem.cs b/src/LibHac/IO/IFileSystem.cs
index 762a7236..1d1a0ba5 100644
--- a/src/LibHac/IO/IFileSystem.cs
+++ b/src/LibHac/IO/IFileSystem.cs
@@ -117,7 +117,7 @@ namespace LibHac.IO
         /// </summary>
         void Commit();
 
-        void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId);
+        void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId);
     }
 
     /// <summary>
diff --git a/src/LibHac/IO/LayeredFileSystem.cs b/src/LibHac/IO/LayeredFileSystem.cs
index 5972fbc3..57f7c34e 100644
--- a/src/LibHac/IO/LayeredFileSystem.cs
+++ b/src/LibHac/IO/LayeredFileSystem.cs
@@ -112,7 +112,7 @@ namespace LibHac.IO
             throw new FileNotFoundException(path);
         }
 
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId)
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId)
         {
             path = PathTools.Normalize(path);
 
diff --git a/src/LibHac/IO/LocalFileSystem.cs b/src/LibHac/IO/LocalFileSystem.cs
index 679b5ae2..489c0233 100644
--- a/src/LibHac/IO/LocalFileSystem.cs
+++ b/src/LibHac/IO/LocalFileSystem.cs
@@ -186,6 +186,6 @@ namespace LibHac.IO
 
         public void Commit() { }
 
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
     }
 }
diff --git a/src/LibHac/IO/PartitionFileSystem.cs b/src/LibHac/IO/PartitionFileSystem.cs
index 291b8fdf..ed36a7d3 100644
--- a/src/LibHac/IO/PartitionFileSystem.cs
+++ b/src/LibHac/IO/PartitionFileSystem.cs
@@ -85,7 +85,7 @@ namespace LibHac.IO
         public long GetTotalSpaceSize(string path) => throw new NotSupportedException();
         public FileTimeStampRaw GetFileTimeStampRaw(string path) => throw new NotSupportedException();
         public void Commit() { }
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
     }
 
     public enum PartitionFileSystemType
diff --git a/src/LibHac/IO/RomFs/RomFsFileSystem.cs b/src/LibHac/IO/RomFs/RomFsFileSystem.cs
index b7953dac..60b60ca7 100644
--- a/src/LibHac/IO/RomFs/RomFsFileSystem.cs
+++ b/src/LibHac/IO/RomFs/RomFsFileSystem.cs
@@ -92,7 +92,7 @@ namespace LibHac.IO.RomFs
         public long GetFreeSpaceSize(string path) => throw new NotSupportedException();
         public long GetTotalSpaceSize(string path) => throw new NotSupportedException();
         public FileTimeStampRaw GetFileTimeStampRaw(string path) => throw new NotSupportedException();
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
     }
 
     public class RomfsHeader
diff --git a/src/LibHac/IO/Save/SaveDataFileSystem.cs b/src/LibHac/IO/Save/SaveDataFileSystem.cs
index 62873021..a1652d44 100644
--- a/src/LibHac/IO/Save/SaveDataFileSystem.cs
+++ b/src/LibHac/IO/Save/SaveDataFileSystem.cs
@@ -206,7 +206,7 @@ namespace LibHac.IO.Save
         }
 
         public FileTimeStampRaw GetFileTimeStampRaw(string path) => throw new NotSupportedException();
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
 
         public bool Commit(Keyset keyset)
         {
diff --git a/src/LibHac/IO/Save/SaveDataFileSystemCore.cs b/src/LibHac/IO/Save/SaveDataFileSystemCore.cs
index b2514232..d011961a 100644
--- a/src/LibHac/IO/Save/SaveDataFileSystemCore.cs
+++ b/src/LibHac/IO/Save/SaveDataFileSystemCore.cs
@@ -143,7 +143,7 @@ namespace LibHac.IO.Save
         }
 
         public FileTimeStampRaw GetFileTimeStampRaw(string path) => throw new NotSupportedException();
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId) => throw new NotSupportedException();
 
         public IStorage GetBaseStorage() => BaseStorage.AsReadOnly();
         public IStorage GetHeaderStorage() => HeaderStorage.AsReadOnly();
diff --git a/src/LibHac/IO/SubdirectoryFileSystem.cs b/src/LibHac/IO/SubdirectoryFileSystem.cs
index 9eb8ec19..e240b028 100644
--- a/src/LibHac/IO/SubdirectoryFileSystem.cs
+++ b/src/LibHac/IO/SubdirectoryFileSystem.cs
@@ -126,7 +126,7 @@ namespace LibHac.IO
             return ParentFileSystem.GetFileTimeStampRaw(ResolveFullPath(path));
         }
 
-        public void QueryEntry(Span<byte> outBuffer, Span<byte> inBuffer, string path, QueryId queryId)
+        public void QueryEntry(Span<byte> outBuffer, ReadOnlySpan<byte> inBuffer, string path, QueryId queryId)
         {
             path = PathTools.Normalize(path);