Fix architecture override.