Fixed errors with PCI conflicting with XHCI build