More changes to handle multi-platform PCSI kit building.