A couple armor fixes