Fix more deprecations for 1.9.0