diff --git a/sysmodules/rosalina/source/gdb/net.c b/sysmodules/rosalina/source/gdb/net.c
index bcd984d..b328b4b 100644
--- a/sysmodules/rosalina/source/gdb/net.c
+++ b/sysmodules/rosalina/source/gdb/net.c
@@ -320,7 +320,7 @@ int GDB_SendStreamData(GDBContext *ctx, const char *streamData, u32 offset, u32
 
     if((forceEmptyLast && offset >= totalSize) || (!forceEmptyLast && offset + length >= totalSize))
     {
-        length = totalSize - offset;
+        length = offset >= totalSize ? 0 : totalSize - offset;
         buf[0] = 'l';
         memcpy(buf + 1, streamData + offset, length);
         return GDB_SendPacket(ctx, buf, 1 + length);
diff --git a/sysmodules/rosalina/source/gdb/xml/osdata_cfw_version_template.xml b/sysmodules/rosalina/source/gdb/xml/osdata_cfw_version_template.xml
index f0e63f0..dc877c2 100644
Binary files a/sysmodules/rosalina/source/gdb/xml/osdata_cfw_version_template.xml and b/sysmodules/rosalina/source/gdb/xml/osdata_cfw_version_template.xml differ
diff --git a/sysmodules/rosalina/source/gdb/xml/osdata_memory_template.xml b/sysmodules/rosalina/source/gdb/xml/osdata_memory_template.xml
index 8b752f8..b1c0e52 100644
Binary files a/sysmodules/rosalina/source/gdb/xml/osdata_memory_template.xml and b/sysmodules/rosalina/source/gdb/xml/osdata_memory_template.xml differ