move all arch fixups from Install to Prepare stage, so that fixed headers are availab...