More armour fixes