port more changes to make PCI work