Fix more deprecations.