Fix arch selection.