Fixed Some Armor Bugs