Various armor fixes