Multiarch Fixes - pcb

No unpublished successful runs for pcb.