Fixed up some armor stuff