Fixed More Armor Type Errors