diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
index 0597cf9b4e..c79e4e83a7 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
@@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Applets
             _system = system;
         }
 
-        unsafe public ResultCode Start(AppletSession normalSession,
+        public ResultCode Start(AppletSession normalSession,
                                        AppletSession interactiveSession)
         {
             _normalSession = normalSession;
diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
index 4097eddf12..7a91ce1e4b 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs
@@ -59,23 +59,23 @@ namespace Ryujinx.HLE.HOS.Services.Ro
             {
                 return ResultCode.InvalidNrr;
             }
-            else if (header.NrrSize != nrrSize)
+            else if (header.Size != nrrSize)
             {
                 return ResultCode.InvalidSize;
             }
 
             List<byte[]> hashes = new List<byte[]>();
 
-            for (int i = 0; i < header.HashCount; i++)
+            for (int i = 0; i < header.HashesCount; i++)
             {
-                byte[] temp = new byte[0x20];
+                byte[] hash = new byte[0x20];
 
-                _owner.CpuMemory.Read(nrrAddress + header.HashOffset + (uint)(i * 0x20), temp);
+                _owner.CpuMemory.Read(nrrAddress + header.HashesOffset + (uint)(i * 0x20), hash);
 
-                hashes.Add(temp);
+                hashes.Add(hash);
             }
 
-            nrrInfo = new NrrInfo((ulong)nrrAddress, header, hashes);
+            nrrInfo = new NrrInfo(nrrAddress, header, hashes);
 
             return ResultCode.Success;
         }
diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
index a95f44f8b2..2b59938801 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NRRCertification.cs
@@ -1,23 +1,15 @@
+using Ryujinx.Common.Memory;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Services.Ro
 {
-    [StructLayout(LayoutKind.Explicit, Size = 0x220)]
+    [StructLayout(LayoutKind.Sequential, Size = 0x220)]
     unsafe struct NRRCertification
     {
-        [FieldOffset(0)]
         public ulong ApplicationIdMask;
-
-        [FieldOffset(0x8)]
         public ulong ApplicationIdPattern;
-
-        [FieldOffset(0x10)]
-        public fixed byte Reserved[0x10];
-
-        [FieldOffset(0x20)]
+        private Array16<byte> _reserved;
         public fixed byte Modulus[0x100];
-
-        [FieldOffset(0x120)]
         public fixed byte Signature[0x100];
     }
 }
diff --git a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
index af692628e3..53fc6a2fac 100644
--- a/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
+++ b/Ryujinx.HLE/HOS/Services/Ro/Types/NrrHeader.cs
@@ -1,44 +1,32 @@
+using Ryujinx.Common.Memory;
+using System;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.HLE.HOS.Services.Ro
 {
-    [StructLayout(LayoutKind.Explicit, Size = 0x350)]
-    unsafe struct NrrHeader
+    [StructLayout(LayoutKind.Sequential, Size = 0x350)]
+    struct NrrHeader
     {
-        [FieldOffset(0)]
         public uint Magic;
-
-        [FieldOffset(0x4)]
-        public uint CertificationSignatureKeyGeneration; // 9.0.0+
-
-        [FieldOffset(0x8)]
-        public ulong Reserved;
-
-        [FieldOffset(0x10)]
+        public uint KeyGeneration; // 9.0.0+
+        private Array8<byte> _reserved;
         public NRRCertification Certification;
-
-        [FieldOffset(0x230)]
-        public fixed byte NrrSignature[0x100];
-
-        [FieldOffset(0x330)]
+        public NrrSignature Signature;
         public ulong TitleId;
+        public uint Size;
+        public byte Kind; // 7.0.0+
+        private Array3<byte> _reserved2;
+        public uint HashesOffset;
+        public uint HashesCount;
+        private Array8<byte> _reserved3;
 
-        [FieldOffset(0x338)]
-        public uint NrrSize;
 
-        [FieldOffset(0x33C)]
-        public byte Type; // 7.0.0+
+        [StructLayout(LayoutKind.Sequential, Size = 0x100)]
+        public struct NrrSignature
+        {
+            private byte element;
 
-        [FieldOffset(0x33D)]
-        public fixed byte Reserved2[0x3];
-
-        [FieldOffset(0x340)]
-        public uint HashOffset;
-
-        [FieldOffset(0x344)]
-        public uint HashCount;
-
-        [FieldOffset(0x348)]
-        public ulong Reserved3;
+            public Span<byte> ToSpan() => MemoryMarshal.CreateSpan(ref element, 0x100);
+        }
     }
 }