diff --git a/inc/drivers/pci.h b/inc/drivers/pci.h
index 0a01442..d8c5d59 100644
--- a/inc/drivers/pci.h
+++ b/inc/drivers/pci.h
@@ -56,7 +56,7 @@ typedef enum {
     PCI_SUBCLASS_ISDN_CONTROLLER                                    = 0x04,
     PCI_SUBCLASS_WORLDFIP_CONTROLLER                                = 0x05,
     PCI_SUBCLASS_PICMG_2_14_MULTI_COMPUTING_CONTROLLER              = 0x06,
-    PCI_SUBCLASS_INFINIBAND_CONTROLLER                              = 0x07,
+    PCI_SUBCLASS_INFINIBAND_NETWORKCONTROLLER                       = 0x07,
     PCI_SUBCLASS_FABRIC_CONTROLLER                                  = 0x08,
     PCI_SUBCLASS_OTHER_NETWORK_CONTROLLER                           = 0x80
 } pci_network_controller_subclasses_T;
@@ -151,7 +151,7 @@ typedef enum {
     PCI_SUBCLASS_USB_CONTROLLER                                     = 0x03,
     PCI_SUBCLASS_FIBRE_CHANNEL                                      = 0x04,
     PCI_SUBCLASS_SMBUS_CONTROLLER                                   = 0x05,
-    PCI_SUBCLASS_INFINIBAND_CONTROLLER                              = 0x06,
+    PCI_SUBCLASS_INFINIBAND_SERIAL_BUS_CONTROLLER                   = 0x06,
     PCI_SUBCLASS_IPMI_INTERFACE                                     = 0x07,
     PCI_SUBCLASS_SERCOS_INTERFACE                                   = 0x08,
     PCI_SUBCLASS_CANBUS_CONTROOLLER                                 = 0x09,
@@ -193,7 +193,7 @@ typedef enum {
     PCI_SUBCLASS_SIGNAL_PROCESSING_MANAGEMENT                       = 0x20,
     PCI_SUBCLASS_OTHER_SIGNAL_PROCESSING_CONTROLLER                 = 0x80
 } pci_signal_processing_controller_subclasses_T;
-
+/*
 typedef enum {
 
 } pci_processing_accelerator_subclasses_T;
@@ -201,7 +201,7 @@ typedef enum {
 typedef enum {
 
 } pci_non_essential_instrumentation_subclasses_T;
-
+*/
 
 
 typedef struct {
diff --git a/src/drivers/acpi/acpi.c b/src/drivers/acpi/acpi.c
index 52ff88b..ae2ef97 100644
--- a/src/drivers/acpi/acpi.c
+++ b/src/drivers/acpi/acpi.c
@@ -41,7 +41,7 @@ void acpi_init(boot_info_T* boot_info) {
         }
     }
 
-    g_mcfg_table = acpi_find_table("MCFG");
+    g_mcfg_table = acpi_find_table(rsdp, "MCFG");
 }
 
 acpi_sdt_header_T* acpi_find_table(acpi_sdt_header_T* xsdt, string_t table_id) {
diff --git a/src/drivers/pci.c b/src/drivers/pci.c
index 27a9087..e1bb31b 100644
--- a/src/drivers/pci.c
+++ b/src/drivers/pci.c
@@ -40,7 +40,7 @@ void pci_init(acpi_sdt_header_T *xsdt) {
 
     uint32_t        device_index = 0;
     while(device_index < num_devices) {
-        pci_decode_device(entries[device_index]);
+        pci_decode_device(&entries[device_index]);
         ++device_index;
     }
 }