More changes to boot PAC