Armor tweaks