Fixed some bugs with armor