Fix arch_override