Minor fixes to Armoryd and a merge item.