arch_desc fixes for local builds.