Support compilation of individual arch
Fix indentation inconsistency