Multi-Arch Fixes - Candidates