diff --git a/i386/legacy-boot/src-asm/drivers/acpi/utility.asm b/i386/legacy-boot/src-asm/drivers/acpi/utility.asm
index 425bd2f..089f9ec 100644
--- a/i386/legacy-boot/src-asm/drivers/acpi/utility.asm
+++ b/i386/legacy-boot/src-asm/drivers/acpi/utility.asm
@@ -53,7 +53,7 @@ acpi_enumerate_tables:
     mov ebx, [esi + 8]
     add ebx, eax
 
-    mov eax, [ebx]Z
+    mov eax, [ebx]
 
     inc ecx
     jmp .enumeration_loop
@@ -97,7 +97,7 @@ acpi_search_rsdt:
     pop         ebp
 
     cmp         ax,                     0
-    jne         .rsdp_found
+    jne         .resolve_rsdp
 
     add         ecx,                    16
     cmp         ecx,                    0x100000
@@ -105,6 +105,7 @@ acpi_search_rsdt:
     
     ; If no "RSD PTR "-signature could be found
     xor         ecx,                    ecx
+    jmp .epilog
 
 .resolve_rsdp:
     ; The 4-byte RSDT-pointer is at byte-offset 4 into the RSDP strucfture.