diff --git a/drivers/nvme/nvme.asm b/drivers/nvme/nvme.asm
index 6b4fc0a..a7442ed 100644
--- a/drivers/nvme/nvme.asm
+++ b/drivers/nvme/nvme.asm
@@ -149,7 +149,7 @@ proc add_nvme_disk stdcall, pci:dword
 	ret
 
 @@:
-	DEBUGF  DBG_INFO, "nvme%un%u: Failed to register disk\n", [esi + pcidev.num], [esi + pcidev.nsid]
+	DEBUGF  DBG_INFO, "nvme%u: Failed to register disk\n", [esi + pcidev.num]
 	xor 	eax, eax
 	pop 	esi
 	ret
@@ -1091,6 +1091,8 @@ proc nvme_init stdcall, pci:dword
 	mov 	al, byte [edi + IDENTN.nsfeat]
 	mov 	byte [ebx + NSINFO.features], al
 	;DEBUGF  DBG_INFO, "nvme%un%u: Namespace Features: 0x%x\n", [esi + pcidev.num], [esi + pcidev.nsid], al
+	mov 	eax, dword [esi + pcidev.nsid]
+	mov 	dword [ebx + NSINFO.nsid], eax
 	mov 	dword [ebx + NSINFO.pci], esi
 	mov 	eax, dword [edi + IDENTN.nsze]
 	mov 	dword [ebx + NSINFO.size], eax
@@ -1377,7 +1379,7 @@ proc consume_cq_entries stdcall, pci:dword, queue:dword
 	mov 	edx, ecx
 	imul 	edx, sizeof.CQ_ENTRY
 	mov 	ax, word [edi + edx + CQ_ENTRY.status]
-	DEBUGF  DBG_INFO, "Status: 0x%x\n", ax
+	;DEBUGF  DBG_INFO, "Status: 0x%x\n", ax
 	inc 	cx
 	push 	ecx
 	stdcall cqyhdbl_write, [pci], [queue], ecx