build fixes around armory