Fix subarch + stop at first error