Following latest balance changes, fix some armors