Fix arch QA issues