Fix more deprecation warnings